diff --git a/.gitlab/bin/push.sh b/.gitlab/bin/push.sh index e93101a..c425216 100755 --- a/.gitlab/bin/push.sh +++ b/.gitlab/bin/push.sh @@ -8,7 +8,7 @@ set -eu -o pipefail readonly APORTSDIR=$CI_PROJECT_DIR -readonly REPOS="backports user" +readonly REPOS="ilot" readonly BASEBRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" @@ -20,19 +20,19 @@ chmod 700 "$HOME"/.ssh/id_rsa chmod 700 "$HOME"/.abuild/$ABUILD_KEY_NAME.rsa echo "PACKAGER_PRIVKEY=$HOME/.abuild/$ABUILD_KEY_NAME.rsa" > $HOME/.abuild/abuild.conf -echo "REPODEST=$HOME/repo-apk" >> $HOME/.abuild/abuild.conf +echo "REPODEST=$HOME/apk" >> $HOME/.abuild/abuild.conf sudo cp $HOME/.abuild/$ABUILD_KEY_NAME.rsa.pub /etc/apk/keys/. -if [ -d $HOME/repo-apk ]; then - git -C $HOME/repo-apk fetch - git -C $HOME/repo-apk checkout $BASEBRANCH - git -C $HOME/repo-apk pull --rebase +if [ -d $HOME/apk ]; then + git -C $HOME/apk fetch + git -C $HOME/apk checkout $BASEBRANCH + git -C $HOME/apk pull --rebase else - git clone git@lab.ilot.io:ayakael/repo-apk -b $BASEBRANCH $HOME/repo-apk + git clone git@lab.ilot.io:ilot/apk -b $BASEBRANCH $HOME/apk fi for i in $(find packages -type f -name "*.apk"); do - install -vDm644 $i ${i/packages/$HOME\/repo-apk} + install -vDm644 $i ${i/packages/$HOME\/apk} done fetch_flags="-qn" @@ -40,17 +40,17 @@ git fetch $fetch_flags "$CI_MERGE_REQUEST_PROJECT_URL" \ "+refs/heads/$BASEBRANCH:refs/heads/$BASEBRANCH" for repo in $(changed_repos); do - rm $HOME/repo-apk/$repo/*/APKINDEX.tar.gz | true + rm $HOME/apk/$repo/*/APKINDEX.tar.gz | true mkdir -p $repo/DUMMY echo "pkgname=DUMMY" > $repo/DUMMY/APKBUILD cd $repo/DUMMY - for i in $(find $HOME/repo-apk/$repo -maxdepth 1 -mindepth 1 -printf '%P '); do + for i in $(find $HOME/apk/$repo -maxdepth 1 -mindepth 1 -printf '%P '); do CHOST=$i abuild index done cd "$CI_PROJECT_DIR" rm -R $repo/DUMMY done -git -C $HOME/repo-apk add . -git -C $HOME/repo-apk commit -m "Update from $CI_MERGE_REQUEST_IID - $CI_MERGE_REQUEST_TITLE" -git -C $HOME/repo-apk push +git -C $HOME/apk add . +git -C $HOME/apk commit -m "Update from $CI_MERGE_REQUEST_IID - $CI_MERGE_REQUEST_TITLE" +git -C $HOME/apk push