diff options
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | repo/java-16-openjdk | 0 | ||||
| -rwxr-xr-x | utils/pkgbuild.sh | 5 |
4 files changed, 10 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1bcfc99..be7650a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,8 +32,7 @@ build: - curl -fL https://keys.openpgp.org/vks/v1/by-fingerprint/4A0F0C8BC709ACA4341767FB243975C8DB9656B9 | pacman-key --add - - pacman-key --finger 4A0F0C8BC709ACA4341767FB243975C8DB9656B9 - pacman-key --lsign-key 4A0F0C8BC709ACA4341767FB243975C8DB9656B9 - #- pacman --noconfirm --needed -Syu kunoisayami-gitlab-ci - - pacman --noconfirm --needed -Syu base-devel git gnupg yay + - pacman --noconfirm --needed -Syu base-devel kunoisayami-ci-build-meta - useradd -m build - echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers #- cp -r ../$CI_PROJECT_TITLE /home/build/ @@ -41,7 +40,7 @@ build: - chown -R build:build ../$CI_PROJECT_TITLE - su -c './utils/pkgbuild.sh --import-gpg' build - su -c './utils/pkgbuild.sh' build - - rm -rf build/ + - "rm -rf build/ || true" # only push to master master trigger push post: diff --git a/.gitmodules b/.gitmodules index dcf4c84..4689474 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,6 @@ [submodule "repo/gtk3-classic"] path = repo/gtk3-classic url = https://aur.archlinux.org/gtk3-classic.git +[submodule "repo/java-16-openjdk"] + path = repo/java-16-openjdk + url = https://aur.archlinux.org/java-16-openjdk.git diff --git a/repo/java-16-openjdk b/repo/java-16-openjdk new file mode 160000 +Subproject 4cf4d9e664b51b1b5564cdf7f783ce2f3870158 diff --git a/utils/pkgbuild.sh b/utils/pkgbuild.sh index fb80679..8d857df 100755 --- a/utils/pkgbuild.sh +++ b/utils/pkgbuild.sh @@ -19,6 +19,7 @@ cleanup() { if ! { [ $# -gt 0 ] && [ "$1" = "--diff" ]; }; then rm -f "$REPO_DIFF" fi + [ -r "$FAIL_REPOS" ] && rm -f "$FAIL_REPOS" unset TMPCONF unset REPO_PENDING unset REPO_DIFF @@ -35,6 +36,7 @@ function hook { ARCH=$(uname -m) PKGBUILD_DIRECTORY_BASE="repo" +FAIL_REPOS="${PWD}/failure_repos" PKGDEST="${PWD}/packages/$ARCH" SRCDEST="${PWD}/build" CONFDEST="${PWD}/makepkg.d/makepkg.$ARCH.conf" @@ -149,6 +151,7 @@ while read -r FOLDER_NAME ; do echo -e "\033[0;32mSkip folder that package already build $FOLDER_NAME\033[0m"; continue fi + echo "$FOLDER_NAME" >> "$FAIL_REPOS" echo -e "\033[0;31mSkip folder $FOLDER_NAME. Build fail: $LAST_STATUS\033[0m"; UNSUCCESSFUL=1; } @@ -162,6 +165,8 @@ date +%s > "$PKGDEST/LASTBUILD" if [ $UNSUCCESSFUL -eq 1 ]; then [ -d "$SRCDEST" ] && rm -r "$SRCDEST" + echo -e "\033[0;31mBuild failed repositories:\033[0m" + cat "$FAIL_REPOS" if [ -n "$CI_DEFAULT_BRANCH" ] && [ -n "$CI_COMMIT_BRANCH" ] && [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then touch .fail echo -e "\033[0;31mCreate fail flag because \$UNSUCCESSFUL set to 1\033[0m" |