From cd14187cb1419e84aa0b9966ad43bd1d383fc178 Mon Sep 17 00:00:00 2001
From: ptrcnull <git@ptrcnull.me>
Date: Sun, 8 Jan 2023 13:48:27 +0100
Subject: [PATCH] meta: fix abuild key importing

---
 .gitlab-ci.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4eb71a..37449c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,13 +13,21 @@ default:
     key: repodest
     paths: [repodest/]
   before_script:
+    # setup ssh
+    - 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
-    - mkdir -p /home/buildozer/.abuild
-    - cp $PACKAGER_PRIVKEY /home/buildozer/.abuild/privkey
-    - echo "PACKAGER_PRIVKEY=/home/buildozer/.abuild/privkey" > /home/buildozer/.abuild/abuild.conf
+    # 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