diff --git a/.gitlab/bin/push.sh b/.gitlab/bin/push.sh index d698f24..6738bd1 100755 --- a/.gitlab/bin/push.sh +++ b/.gitlab/bin/push.sh @@ -13,15 +13,15 @@ readonly BASEBRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -gitlab_key_to_rsa $ABUILD_KEY PRIVATE $HOME/.abuild/key.rsa -gitlab_key_to_rsa $ABUILD_KEY_PUB PUBLIC $HOME/.abuild/key.rsa.pub +gitlab_key_to_rsa $ABUILD_KEY PRIVATE $HOME/.abuild/$ABUILD_KEY_NAME.rsa +gitlab_key_to_rsa $ABUILD_KEY_PUB PUBLIC $HOME/.abuild/$ABUILD_KEY_NAME.rsa.pub gitlab_key_to_rsa $SSH_KEY PRIVATE $HOME/.ssh/id_rsa chmod 700 "$HOME"/.ssh/id_rsa -chmod 700 "$HOME"/.abuild/key.rsa +chmod 700 "$HOME"/.abuild/$ABUILD_KEY_NAME.rsa -echo "PACKAGER_PRIVKEY=$HOME/.abuild/key.rsa" >> $HOME/.abuild/abuild.conf +echo "PACKAGER_PRIVKEY=$HOME/.abuild/$ABUILD_KEY_NAME.rsa" >> $HOME/.abuild/abuild.conf echo "REPODEST=$CI_PROJECT_DIR/repo-apk" >> $HOME/.abuild/abuild.conf -doas cp $HOME/.abuild/key.rsa.pub /etc/apk/keys/. +doas cp $HOME/.abuild/$ABUILD_KEY_NAME.rsa.pub /etc/apk/keys/. git clone git@lab.ilot.io:ayakael/repo-apk -b $BASEBRANCH for i in $(find packages -type f -name "*.apk"); do