diff options
| -rw-r--r-- | docker/dockerfile | 12 | ||||
| -rwxr-xr-x | utils/ci-upload.sh | 41 | ||||
| -rwxr-xr-x | utils/pkgbuild.py (renamed from utils/ng/pkgbuild.py) | 2 | ||||
| -rwxr-xr-x | utils/pkgbuild.sh | 184 | ||||
| -rwxr-xr-x | utils/pkgbuild_bootstrap (renamed from utils/ng/pkgbuild_bootstrap) | 2 | ||||
| -rwxr-xr-x | utils/repodb.sh | 34 | ||||
| -rw-r--r-- | utils/systemd/update-repo-notify.service (renamed from utils/ng/systemd/update-repo-notify.service) | 0 | ||||
| -rw-r--r-- | utils/systemd/update-repo-notify.socket (renamed from utils/ng/systemd/update-repo-notify.socket) | 0 | ||||
| -rw-r--r-- | utils/systemd/[email protected] (renamed from utils/ng/systemd/[email protected]) | 0 | ||||
| -rwxr-xr-x | utils/trigger.py (renamed from utils/ng/trigger.py) | 0 | ||||
| -rwxr-xr-x | utils/update-db.py (renamed from utils/ng/update-db.py) | 0 | ||||
| -rw-r--r-- | utils/upload.php (renamed from utils/ng/upload.php) | 0 | ||||
| -rwxr-xr-x | utils/upload.py (renamed from utils/ng/upload.py) | 0 |
13 files changed, 12 insertions, 263 deletions
diff --git a/docker/dockerfile b/docker/dockerfile index d7b613d..bbc682f 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -26,10 +26,18 @@ RUN if [ ! -r /home/build/hook.sh ]; then reflector --save /etc/pacman.d/mirrorl RUN pacman --noconfirm --needed -Sy archlinux-keyring -RUN pacman --noconfirm --needed -Su base-devel gnupg git yay python python-aiohttp python-aiofiles +RUN pacman --noconfirm --needed -Su base-devel gnupg git yay + +RUN pacman --noconfirm --needed -S python python-aiohttp python-aiofiles moreutils RUN echo 'build ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers +# ADD repos /home/build/repos + +# RUN chown -R build:build /home/build/repos + USER build -ENTRYPOINT ["bash", "-c", "/home/build/repos/utils/ng/pkgbuild_bootstrap"] +# ENTRYPOINT ["bash", "-c", "/home/build/repos/utils/pkgbuild_bootstrap"] + +ENTRYPOINT ["bash", "-c", "/home/build/dockerbuild.sh"]
\ No newline at end of file diff --git a/utils/ci-upload.sh b/utils/ci-upload.sh deleted file mode 100755 index 9b1b822..0000000 --- a/utils/ci-upload.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# end up when failed -set -Eeuo pipefail - -# clean up when exit -trap cleanup SIGINT SIGTERM ERR EXIT -cleanup() { - trap - SIGINT SIGTERM ERR EXIT - unset ARCH - unset PKGDEST -} - -ARCH=$(uname -m) -PKGDEST="${PWD}/packages/$ARCH" - -if [ $(find $PKGDEST -name \*.pkg\* | wc -l) -eq 0 ]; then - echo -e "\033[0;31mCould not find any packaged packages, skip upload\033[0m" - if [ -r .fail ]; then - exit 2; - fi - exit 0 -fi - -curl -d "token=$UPLOAD_TOKEN&action=REQUIRE_CLEAN&arch=$ARCH" -fsSL "$REMOTE_PATH" - -pushd $PKGDEST - -for file in *.pkg*; do - echo "Start upload package $file size: $(ls -lh $file | awk '{print $5}')..." - curl -F "file=@$file" -F "token=$UPLOAD_TOKEN" -F "arch=$ARCH" -fsSL "$REMOTE_PATH" - #echo "Stop upload package $file" -done - -popd - -curl -d "token=$UPLOAD_TOKEN&action=UPLOADED&arch=$ARCH" -fsSL "$REMOTE_PATH" - -if [ -r .fail ]; then - exit 2; -fi diff --git a/utils/ng/pkgbuild.py b/utils/pkgbuild.py index e3f46f1..a36f620 100755 --- a/utils/ng/pkgbuild.py +++ b/utils/pkgbuild.py @@ -370,7 +370,7 @@ async def upload_packages() -> None: logger.error("$REMOTE_PATH OR $UPLOAD_TOKEN is None, skipped upload") await ( await asyncio.create_subprocess_exec( - "./utils/ng/upload.py", + "./utils/upload.py", remote_path, upload_token, ARCH, diff --git a/utils/pkgbuild.sh b/utils/pkgbuild.sh deleted file mode 100755 index 0342096..0000000 --- a/utils/pkgbuild.sh +++ /dev/null @@ -1,184 +0,0 @@ -#!/bin/bash - -# end up when failed -set -Eeo pipefail - -# clean up when exit -trap cleanup SIGINT SIGTERM ERR EXIT -cleanup() { - trap - SIGINT SIGTERM ERR EXIT - unset SIGNING_ARG - unset UNSUCCESSFUL - unset SKIP_VERIFIED - unset FOLDER_NAME - unset PKGDEST - unset SRCDEST - unset CONFDEST - unset REPO_DEST - rm -f "$TMPCONF" - 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 - unset PKGBUILD_DIRECTORY_BASE - unset ARCH -} - -function hook { - if [ -r ../.hook/"$1" ]; then - echo "Running $1 Hook script" - ../.hook/"$1" - fi -} - -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" -REPO_DIFF="${PWD}/packages/$ARCH/DIFF" -SKIP_VERIFIED=1 -UNSUCCESSFUL=0 -SIGNING_ARG="--nosign" - -TMPCONF=$(mktemp -t makepkg.$ARCH.conf.XXXXXXXXXX) || exit 1 -cat "${PWD}/makepkg.d/makepkg.base.conf" > "$TMPCONF" -cat "$CONFDEST" >> "$TMPCONF" - -touch "$REPO_DIFF" - -function get_diff_list { - git diff --name-only HEAD^ | while read line; do - if [[ $line =~ $PKGBUILD_DIRECTORY_BASE/\..+ ]] && [ "$line" != "$PKGBUILD_DIRECTORY_BASE/.verified_repos" ]; then - echo "$line" | cut -d'/' -f3 >> "$REPO_DIFF" - elif [[ $line =~ $PKGBUILD_DIRECTORY_BASE ]]; then - echo "$line" | cut -d'/' -f2 >> "$REPO_DIFF" - fi - done - cp "$REPO_DIFF" "${REPO_DIFF}_tmp" - sort -u "${REPO_DIFF}_tmp" > "$REPO_DIFF" - rm -f "${REPO_DIFF}_tmp" -} - -if [ $# -gt 0 ];then - if [ "$1" = "--diff" ]; then - get_diff_list - exit 0 - elif [ "$1" = "--import-gpg" ]; then - if [ -n "$CI_COMMIT_BRANCH" ] && [ -n "$CI_DEFAULT_BRANCH" ] && [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then - echo $GPG_PRIV_KEY | base64 -d | gpg --import - else - echo -e "\033[0;32mSkip import gpg key\033[0m" - fi - exit 0 - fi -fi - -if [ "$EUID" -eq 0 ] ; then - echo "\033[0;32mPlease run this script as non-root\033[0m" - exit 3 -fi - -if [ $# -gt 0 ] && [ "$1" = "--all" ] || [ -n "$CI_COMMIT_TITLE" ] && [[ $CI_COMMIT_TITLE =~ fix\(repo\)|REBUILD ]]; then - if [ -z "${FORCE_ALL+x}" ] || [ -n "$CI_COMMIT_TITLE" ] && [[ $CI_COMMIT_TITLE =~ REBUILD(\ |_)ALL ]]; then - SKIP_VERIFIED=0 - fi - ls $PKGBUILD_DIRECTORY_BASE > "$REPO_DIFF" -else - get_diff_list -fi - -if [ -n "$CI_COMMIT_BRANCH" ] && [ -n "$CI_DEFAULT_BRANCH" ] && [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then - SIGNING_ARG="--sign" -else - echo -e "\033[0;32mSkip signing package\033[0m" -fi - -pushd $PKGBUILD_DIRECTORY_BASE || ( echo -e "\033[0;31mError, can't switch to pkgbuild directory\033[0m" && exit 1 ) - -while read -r FOLDER_NAME ; do - if [ ! -d "$FOLDER_NAME" ]; then - echo -e "\033[0;32mSkip folder $FOLDER_NAME\033[0m" - continue - fi - echo -e "\033[0;32mProcessing $FOLDER_NAME\033[0m" - pushd "$FOLDER_NAME" || { echo -e "\033[1;33mWarning, can't chdir to $FOLDER_NAME, skipped\033[0m"; continue; } - - if [ -n "$CI_COMMIT_TITLE" ] && [[ $CI_COMMIT_TITLE =~ fix\(repo\)|REBUILD ]] && \ - [ $SKIP_VERIFIED -eq 1 ] && grep -Fxq "$FOLDER_NAME" "../.verified_repos"; then - echo -e "\033[0;32mSkip folder $FOLDER_NAME (verified repository)\033[0m" - popd - continue - fi - - # hook must run before other checker - hook "$FOLDER_NAME" - - # Check PKGBUILD architecture - if ! ( pcregrep -M 'arch=\([^\)]*\)' PKGBUILD | grep -E "$ARCH|any" >/dev/null ); then - echo -e "\033[0;32mSkip folder $FOLDER_NAME (Architecture not match)\033[0m" - popd - continue - fi - - if [ -n "$CI_COMMIT_TITLE" ] && [[ $CI_COMMIT_TITLE =~ fix\(repo\)|REBUILD ]] && \ - [ $SKIP_VERIFIED -eq 1 ] && grep -Fxq "$FOLDER_NAME" "../.verified_repos"; then - echo -e "\033[0;32mSkip folder $FOLDER_NAME (verified repository)\033[0m" - popd - continue - fi - - if [ -r ../.yaydeps/"$FOLDER_NAME" ]; then - while read -r YAYDEP ; do - if [ -d "../$YAYDEP" ]; then - pushd "../$YAYDEP" - hook "$YAYDEP" - SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF="$TMPCONF" makepkg --clean -s -i $SIGNING_ARG --asdeps --noconfirm --needed --noprogressbar - popd - else - yay -S --noconfirm --needed --asdeps "$YAYDEP" - fi - done < ../.yaydeps/"$FOLDER_NAME" - fi - - if [ -r ../.gpg_keys/"$FOLDER_NAME" ]; then - . ../.gpg_keys/"$FOLDER_NAME" - # source: https://stackoverflow.com/a/53886735 - gpg --list-keys --fingerprint | grep pub -A 1 | grep -Ev "pub|--" | tr -d ' ' \ - | awk 'BEGIN { FS = "\n" } ; { print $1":6:" } ' | gpg --import-ownertrust - fi - - SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF="$TMPCONF" makepkg -s --clean $SIGNING_ARG --asdeps --noconfirm --needed --noprogressbar || { - LAST_STATUS=$?; - if [ $LAST_STATUS -eq 13 ]; then - 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; - } - [ -d "$SRCDEST" ] && rm -r "$SRCDEST" - popd -done < "$REPO_DIFF" - -popd - -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" - else - echo -e "\033[0;31mExit due makepkg failed\033[0m" - exit 2 - fi -fi diff --git a/utils/ng/pkgbuild_bootstrap b/utils/pkgbuild_bootstrap index 847b8d5..7f251f8 100755 --- a/utils/ng/pkgbuild_bootstrap +++ b/utils/pkgbuild_bootstrap @@ -50,4 +50,4 @@ curl -fL -o remote.db "$REMOTE_DATABASE" sudo pacman -Sy -./utils/ng/pkgbuild.py remote.db $FLAGS +./utils/pkgbuild.py remote.db $FLAGS diff --git a/utils/repodb.sh b/utils/repodb.sh deleted file mode 100755 index 212b137..0000000 --- a/utils/repodb.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# end up when failed -set -Eeuo pipefail - -# clean up when exit -trap cleanup SIGINT SIGTERM ERR EXIT -cleanup() { - trap - SIGINT SIGTERM ERR EXIT - unset ARCH - unset PKGDEST - unset REPO_DEST - unset GPG_KEY - unset PACKAGE_NAME - unset LATEST -} - -if [ -z $ARCH ]; then - ARCH=$(uname -m) - echo "Warning: You should specify arch environment variable, use current platform: $ARCH" -fi - -REPO_BASE_NAME="kunoisayami" -#ARCH=$(uname -m) -REPO_DEST="${PWD}/packages/$ARCH/$REPO_BASE_NAME.db.tar.xz" -GPG_KEY="4A0F0C8BC709ACA4341767FB243975C8DB9656B9" - -while read PACKAGE_NAME; do - #LATEST=$(ls -t "$PKGDEST/$PACKAGE_NAME"* | grep -v ".sig" | head -n 1 | cut -d' ' -f1) - if [ -z $PACKAGE_NAME ]; then - continue - fi - repo-add "$REPO_DEST" "$PACKAGE_NAME" -s -v -R -k $GPG_KEY -done diff --git a/utils/ng/systemd/update-repo-notify.service b/utils/systemd/update-repo-notify.service index d7e3c9a..d7e3c9a 100644 --- a/utils/ng/systemd/update-repo-notify.service +++ b/utils/systemd/update-repo-notify.service diff --git a/utils/ng/systemd/update-repo-notify.socket b/utils/systemd/update-repo-notify.socket index f14743c..f14743c 100644 --- a/utils/ng/systemd/update-repo-notify.socket +++ b/utils/systemd/update-repo-notify.socket diff --git a/utils/ng/systemd/[email protected] b/utils/systemd/[email protected] index 6fa98da..6fa98da 100644 --- a/utils/ng/systemd/[email protected] +++ b/utils/systemd/[email protected] diff --git a/utils/ng/trigger.py b/utils/trigger.py index ca0cfd1..ca0cfd1 100755 --- a/utils/ng/trigger.py +++ b/utils/trigger.py diff --git a/utils/ng/update-db.py b/utils/update-db.py index acdc8c8..acdc8c8 100755 --- a/utils/ng/update-db.py +++ b/utils/update-db.py diff --git a/utils/ng/upload.php b/utils/upload.php index da848eb..da848eb 100644 --- a/utils/ng/upload.php +++ b/utils/upload.php diff --git a/utils/ng/upload.py b/utils/upload.py index 07f8628..07f8628 100755 --- a/utils/ng/upload.py +++ b/utils/upload.py |