From 69dc8205b143314a6035bea87dad52e1e1e05fb1 Mon Sep 17 00:00:00 2001 From: KunoiSayami Date: Mon, 25 Oct 2021 19:22:43 +0800 Subject: fix: Fix CI/CD configure and script Signed-off-by: KunoiSayami --- .gitlab-ci.yml | 6 +++--- repodb.sh | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be5c0ac..473cb99 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,10 +12,10 @@ build: - useradd -m build - ls .. - echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers - - cp -r ../repos-test /home/build/ - - cd /home/build/repos-test + - cp -r ../$CI_PROJECT_TITLE /home/build/ + - cd /home/build/$CI_PROJECT_TITLE - echo $GPG_PRIV_KEY | base64 -d > ../key.asc - - chown -R build:build ../repos-test + - chown -R build:build ../$CI_PROJECT_TITLE - su -c "bash -c 'cd repo/pod2man && makepkg -i --noconfirm'" build - su -c 'gpg --import ../key.asc' build - su -c 'BUILD_ONLY='' ./pkgbuild.sh' build diff --git a/repodb.sh b/repodb.sh index 659cbe4..c959de4 100755 --- a/repodb.sh +++ b/repodb.sh @@ -17,7 +17,6 @@ cleanup() { REPO_BASE_NAME="kunoisayami" ARCH=$(uname -m) -PKGDEST="${PWD}/packages/$ARCH" REPO_DEST="${PWD}/packages/$ARCH/$REPO_BASE_NAME.db.tar.xz" GPG_KEY="4A0F0C8BC709ACA4341767FB243975C8DB9656B9" @@ -26,5 +25,5 @@ while read PACKAGE_NAME; do if [ -z $PACKAGE_NAME ]; then continue fi - repo-add "$REPO_DEST" "$PACKAGENAME" -s -v -R -k $GPG_KEY + repo-add "$REPO_DEST" "$PACKAGE_NAME" -s -v -R -k $GPG_KEY done -- cgit v1.3.1