diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19168aa..9fdf349 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,7 @@ push: stage: deploy script: - | - sudo apk add abuild git-lfs findutils + sudo apk add abuild git-annex findutils export PATH="$PATH:$CI_PROJECT_DIR/.gitlab/bin" push.sh rules: diff --git a/.gitlab/bin/build.sh b/.gitlab/bin/build.sh index 333eab7..5905fbc 100755 --- a/.gitlab/bin/build.sh +++ b/.gitlab/bin/build.sh @@ -81,7 +81,7 @@ get_release() { get_qubes_release() { case $BASEBRANCH in r*) echo $BASEBRANCH;; - main) echo r4.3;; + master) echo r4.2;; *) die "Branch \"$BASEBRANCH\" not supported!" esac } diff --git a/.gitlab/bin/push.sh b/.gitlab/bin/push.sh index b364688..47185e7 100755 --- a/.gitlab/bin/push.sh +++ b/.gitlab/bin/push.sh @@ -26,7 +26,7 @@ sudo cp $HOME/.abuild/$ABUILD_KEY_NAME.rsa.pub /etc/apk/keys/. get_qubes_release() { case $BASEBRANCH in r*) echo $BASEBRANCH;; - main) echo r4.3;; + master) echo r4.2;; *) die "Branch \"$BASEBRANCH\" not supported!" esac } @@ -40,9 +40,11 @@ for release in $(find packages -type d -maxdepth 1 -mindepth 1 -printf '%f\n'); git -C $HOME/repo-apk checkout $release git -C $HOME/repo-apk pull --rebase else - git clone git@lab.ilot.io:ayakael/repo-apk -b $release $HOME/repo-apk + git clone forgejo@ayakael.net:forge/repo-apk.git -b $BASEBRANCH $HOME/repo-apk fi + git -C $HOME/repo-apk annex sync --content + for i in $(find packages/$release -type f -name "*.apk"); do install -vDm644 $i ${i/packages\/$release\/qubes-aports/$HOME\/repo-apk\/qubes\/$QUBES_REL} done @@ -61,5 +63,5 @@ for release in $(find packages -type d -maxdepth 1 -mindepth 1 -printf '%f\n'); 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/repo-apk annex sync --content done