From 7a691c442be5b74a8bf00a63ac63a5cf4743f34e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 10 Aug 2024 11:41:37 -0400 Subject: [PATCH] gitlab-ci: use git-annex instead of git-lfs --- .gitlab-ci.yml | 2 +- .gitlab/bin/push.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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/push.sh b/.gitlab/bin/push.sh index 3c35179..47185e7 100755 --- a/.gitlab/bin/push.sh +++ b/.gitlab/bin/push.sh @@ -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