From 8a8d68e43ddef04826d5106106ea92e5e21bb99d Mon Sep 17 00:00:00 2001
From: ptrcnull <git@ptrcnull.me>
Date: Tue, 28 Mar 2023 19:56:51 +0200
Subject: [PATCH] meta: improve ci

---
 .gitlab-ci.yml | 64 ++++++++++----------------------------------------
 1 file changed, 12 insertions(+), 52 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58f84c4..c211ee8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,62 +2,28 @@ workflow:
   rules:
     - if: $CI_COMMIT_BRANCH == "master"
 
-stages:
-  - fetch
-  - build
-  - upload
-
-default:
-  image: alpine:edge
-  cache:
-    key: repodest
-    paths: [repodest/]
-  before_script:
-    # setup ssh
-    - apk upgrade -a
-    - apk add openssh-keygen
-    - mkdir $HOME/.ssh
-    - chmod 600 $PRIVATE_KEY
-    - echo "repo.ptrc.gay ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGTcxqAgqWGqVDH5lscsXVp6eWxFblarg+YA1EPxjUvm" > $HOME/.ssh/known_hosts
-    - echo "IdentityFile $PRIVATE_KEY" > $HOME/.ssh/config
-    # setup abuild
-    - confdir=/home/buildozer/.abuild
-    - keyname=alpine@ptrcnull.me-60610fa4.rsa
-    - mkdir -p $confdir
-    - cp $PACKAGER_PRIVKEY $confdir/$keyname
-    - chown 600 $confdir/$keyname
-    - echo "PACKAGER_PRIVKEY=$confdir/$keyname" > $confdir/abuild.conf
-    - ssh-keygen -e -m pkcs8 -f $confdir/$keyname > $confdir/$keyname.pub
-    # add our own key to trusted keys
-    - cp ptrcports-keys/*.pub /etc/apk/keys/
-    - chown -R 1000:1000 /home/buildozer
-    - mkdir -p repodest
-
-fetch:
-  stage: fetch
-  script:
-    - apk add openssh-client rsync
-    - rsync --archive --update --hard-links --delete --delete-after --delay-updates buildozer@repo.ptrc.gay:repodest/ repodest/
-
 build-x86_64: &build
+  image: registry.git.ptrc.gay/ptrcnull/ptrcports-builder/x86_64:latest
   stage: build
-  resource_group: build
   script:
-    - apk add lua-aports alpine-sdk s6
-    - adduser -D buildozer
-    - adduser buildozer abuild
-    - chown -R buildozer:buildozer *
-    - s6-setuidgid buildozer
-      env HOME=/home/buildozer
-      buildrepo
+    - setup-ssh-key "$PRIVATE_KEY"
+    - setup-abuild-key "$PACKAGER_PRIVKEY" "alpine@ptrcnull.me-60610fa4.rsa"
+    - mkdir -p repodest
+    - rsync --archive --update --hard-links --delete --delete-after --delay-updates
+        buildozer@repo.ptrc.gay:repodest/
+        repodest/
+    - buildrepo
         --aports $PWD/..
         --destdir $PWD/repodest
         --purge
         ptrcports
+    - rsync --archive --update --hard-links --delete --delete-after --delay-updates
+        repodest/
+        buildozer@repo.ptrc.gay:repodest/
 
 build-aarch64:
   <<: *build
-  image: arm64v8/alpine:edge
+  image: registry.git.ptrc.gay/ptrcnull/ptrcports-builder/arm64v8:latest
 
 # build-armhf:
 #   <<: *build
@@ -82,9 +48,3 @@ build-aarch64:
 # build-x86:
 #   <<: *build
 #   image: i386/alpine:edge
-
-upload:
-  stage: upload
-  script:
-    - apk add openssh-client rsync
-    - rsync --archive --update --hard-links --delete --delete-after --delay-updates repodest/ buildozer@repo.ptrc.gay:repodest/