From d456c63482e27f3ebfc7d2db87cb321ae38a06a6 Mon Sep 17 00:00:00 2001 From: Archlinux-Jerry Build Bot Date: Thu, 24 Oct 2019 12:44:39 +0800 Subject: [PATCH] change: aur update hooks --- .buildbot/aur.hook.d/config.sh.example | 24 +++++++ .buildbot/aur.hook.d/update.sh | 72 +++++++++++++++++++ scrcpy/buildbot.update.d/config.sh | 23 +++++++ scrcpy/buildbot.update.d/update.sh | 95 +------------------------- yay/buildbot.update.d/config.sh | 24 +++++++ yay/buildbot.update.d/update.sh | 95 +------------------------- 6 files changed, 145 insertions(+), 188 deletions(-) create mode 100644 .buildbot/aur.hook.d/config.sh.example create mode 100755 .buildbot/aur.hook.d/update.sh create mode 100644 scrcpy/buildbot.update.d/config.sh mode change 100755 => 120000 scrcpy/buildbot.update.d/update.sh create mode 100644 yay/buildbot.update.d/config.sh mode change 100755 => 120000 yay/buildbot.update.d/update.sh diff --git a/.buildbot/aur.hook.d/config.sh.example b/.buildbot/aur.hook.d/config.sh.example new file mode 100644 index 0000000..4877c34 --- /dev/null +++ b/.buildbot/aur.hook.d/config.sh.example @@ -0,0 +1,24 @@ +#!/bin/bash +# buildbot update hook for aur packages + +PKGNAME='myAwesomePackage' +PKGBUILD='PKGBUILD' + +# prepare upstream source +prepare() { + # sed -i "s/^arch=.*$/arch=('aarch64')/g" PKGBUILD + # git apply 0001.patch + true +} + +# which files to include, overrides exclude_files below +INCLUDE_FILES=( +# 'PKGBUILD' +# '.gitignore' +) + +# which files to exclude, use '*' and '.*' to exclude all +EXCLUDE_FILES=( + '.SRCINFO' + '.git' +) diff --git a/.buildbot/aur.hook.d/update.sh b/.buildbot/aur.hook.d/update.sh new file mode 100755 index 0000000..497f72f --- /dev/null +++ b/.buildbot/aur.hook.d/update.sh @@ -0,0 +1,72 @@ +#!/bin/bash +# buildbot update hook for aur packages +set -e -o pipefail + +assertPkgname() { + if [[ "$(basename $(pwd))" != "$PKGNAME" ]]; then + echo "Please run this script inside the $PKGNAME dir." + exit 1 + fi +} + +## This section does essential preparations +UPDATE_DIR='buildbot.update.d' +source ${UPDATE_DIR}/config.sh +assertPkgname +git pull --ff-only +git checkout $PKGBUILD +VER=$(source $PKGBUILD; printf "%s-%s" "$pkgver" "$pkgrel") + +# This section does actual jobs +newPkgVer() { + # do not print anything to stdout other than new pkgver here + + ver=$(curl -s "https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=${PKGNAME}"| \ + python3 -c 'import json; j=json.loads(input()); print(j.get("results", [dict()])[0].get("Version", 0))') + if [[ "$ver" == "$VER" ]]; then + echo "${PKGNAME} is up to date with aur." >&2 + else + echo "${PKGNAME} has new ver form aur: ${ver}" >&2 + echo "$ver" + fi +} + +newpkgver=$(newPkgVer) +[ -z "$newpkgver" ] && exit 0 + +incfiles='' +for f in "${INCLUDE_FILES[@]}"; do + incfiles="$incfiles"$'\n'"$f" +done + +excfiles='{' +for f in "${EXCLUDE_FILES[@]}"; do + excfiles="${excfiles}${f}," +done +excfiles="${excfiles}}" +[[ "$excfiles" == '{}' ]] && excfiles='' + +pushd "$UPDATE_DIR" >/dev/null +rm -rf "$PKGNAME" +git clone --depth 1 "https://aur.archlinux.org/${PKGNAME}.git" "$PKGNAME" + +cd "$PKGNAME" && prepare +for patch in "${PATCHES[@]}"; do + git apply "../${patch}" +done + +add_files=$(eval ls -1 --almost-all --ignore=${excfiles}) +add_files="${add_files}"$'\n'"${incfiles}" + +while read f; do + [[ -z "$f" ]] && continue + cp -av "$f" ../../ + (cd ../../ && git add "$f") +done <<< "$add_files" + +cd .. +rm -rf "$PKGNAME" +popd >/dev/null + +git commit -m "autoupdate: ${PKGNAME} to ${newpkgver} from aur" +git push diff --git a/scrcpy/buildbot.update.d/config.sh b/scrcpy/buildbot.update.d/config.sh new file mode 100644 index 0000000..4df6f87 --- /dev/null +++ b/scrcpy/buildbot.update.d/config.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# buildbot update hook for aur packages + +PKGNAME='scrcpy' +PKGBUILD='PKGBUILD' + +# prepare upstream source +prepare() { + sed -i "s/^arch=.*$/arch=('aarch64')/g" PKGBUILD + git apply 0001-fix-aarch64-compilation.patch +} + +# which files to include, overrides exclude_files below +INCLUDE_FILES=( +# 'PKGBUILD' +# '.gitignore' +) + +# which files to exclude, use '*' and '.*' to exclude all +EXCLUDE_FILES=( + '.SRCINFO' + '.git' +) diff --git a/scrcpy/buildbot.update.d/update.sh b/scrcpy/buildbot.update.d/update.sh deleted file mode 100755 index d291c64..0000000 --- a/scrcpy/buildbot.update.d/update.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash -# buildbot update hook for aur packages -set -e -o pipefail - -assertPkgname() { - if [[ "$(basename $(pwd))" != "$PKGNAME" ]]; then - echo "Please run this script inside the $PKGNAME dir." - exit 1 - fi -} - -## This section does essential preparations -PKGNAME='scrcpy' && assertPkgname -PKGBUILD='PKGBUILD' -UPDATE_DIR='buildbot.update.d' -git pull --ff-only -git checkout $PKGBUILD -VER=$(source $PKGBUILD; printf "%s-%s" "$pkgver" "$pkgrel") - -# apply patches to the upstream aur package -PATCHES=( - '0001-fix-aarch64-compilation.patch' -) - -# prepare upstream source -prepare() { - sed -i "s/^arch=.*$/arch=('aarch64')/g" PKGBUILD -} - -# which files to include, overrides exclude_files below -INCLUDE_FILES=( -# 'PKGBUILD' -# '.gitignore' -) - -# which files to exclude, use '*' and '.*' to exclude all -EXCLUDE_FILES=( - '.SRCINFO' - '.git' -) - -# This section does actual jobs -newPkgVer() { - # do not print anything to stdout other than new pkgver here - - ver=$(curl -s "https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=${PKGNAME}"| \ - python3 -c 'import json; j=json.loads(input()); print(j.get("results", [dict()])[0].get("Version", 0))') - if [[ "$ver" == "$VER" ]]; then - echo "${PKGNAME} is up to date with aur." >&2 - else - echo "${PKGNAME} has new ver form aur: ${ver}" >&2 - echo "$ver" - fi -} - -newpkgver=$(newPkgVer) -[ -z "$newpkgver" ] && exit 0 - -incfiles='' -for f in "${INCLUDE_FILES[@]}"; do - incfiles="$incfiles"$'\n'"$f" -done - -excfiles='{' -for f in "${EXCLUDE_FILES[@]}"; do - excfiles="${excfiles}${f}," -done -excfiles="${excfiles}}" -[[ "$excfiles" == '{}' ]] && excfiles='' - -pushd "$UPDATE_DIR" >/dev/null -rm -rf "$PKGNAME" -git clone --depth 1 "https://aur.archlinux.org/${PKGNAME}.git" "$PKGNAME" - -cd "$PKGNAME" && prepare -for patch in "${PATCHES[@]}"; do - git apply "../${patch}" -done - -add_files=$(eval ls -1 --almost-all --ignore=${excfiles}) -add_files="${add_files}"$'\n'"${incfiles}" - -while read f; do - [[ -z "$f" ]] && continue - cp -av "$f" ../../ - (cd ../../ && git add "$f") -done <<< "$add_files" - -cd .. -rm -rf "$PKGNAME" -popd >/dev/null - -git commit -m "autoupdate: ${PKGNAME} to ${newpkgver} from aur" -git push diff --git a/scrcpy/buildbot.update.d/update.sh b/scrcpy/buildbot.update.d/update.sh new file mode 120000 index 0000000..7600931 --- /dev/null +++ b/scrcpy/buildbot.update.d/update.sh @@ -0,0 +1 @@ +../../.buildbot/aur.hook.d/update.sh \ No newline at end of file diff --git a/yay/buildbot.update.d/config.sh b/yay/buildbot.update.d/config.sh new file mode 100644 index 0000000..d616129 --- /dev/null +++ b/yay/buildbot.update.d/config.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# buildbot update hook for aur packages + +PKGNAME='yay' +PKGBUILD='PKGBUILD' + +# prepare upstream source +prepare() { + # sed -i "s/^arch=.*$/arch=('aarch64')/g" PKGBUILD + # git apply 0001.patch + true +} + +# which files to include, overrides exclude_files below +INCLUDE_FILES=( +# 'PKGBUILD' +# '.gitignore' +) + +# which files to exclude, use '*' and '.*' to exclude all +EXCLUDE_FILES=( + '.SRCINFO' + '.git' +) diff --git a/yay/buildbot.update.d/update.sh b/yay/buildbot.update.d/update.sh deleted file mode 100755 index e14e1e0..0000000 --- a/yay/buildbot.update.d/update.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash -# buildbot update hook for aur packages -set -e -o pipefail - -assertPkgname() { - if [[ "$(basename $(pwd))" != "$PKGNAME" ]]; then - echo "Please run this script inside the $PKGNAME dir." - exit 1 - fi -} - -## This section does essential preparations -PKGNAME='yay' && assertPkgname -PKGBUILD='PKGBUILD' -UPDATE_DIR='buildbot.update.d' -git pull --ff-only -git checkout $PKGBUILD -VER=$(source $PKGBUILD; printf "%s-%s" "$pkgver" "$pkgrel") - -# apply patches to the upstream aur package -PATCHES=( -) - -# prepare upstream source -prepare() { - # sed -i "s/^arch=.*$/arch=('aarch64')/g" PKGBUILD - true -} - -# which files to include, overrides exclude_files below -INCLUDE_FILES=( -# 'PKGBUILD' -# '.gitignore' -) - -# which files to exclude, use '*' and '.*' to exclude all -EXCLUDE_FILES=( - '.SRCINFO' - '.git' -) - -# This section does actual jobs -newPkgVer() { - # do not print anything to stdout other than new pkgver here - - ver=$(curl -s "https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=${PKGNAME}"| \ - python3 -c 'import json; j=json.loads(input()); print(j.get("results", [dict()])[0].get("Version", 0))') - if [[ "$ver" == "$VER" ]]; then - echo "${PKGNAME} is up to date with aur." >&2 - else - echo "${PKGNAME} has new ver form aur: ${ver}" >&2 - echo "$ver" - fi -} - -newpkgver=$(newPkgVer) -[ -z "$newpkgver" ] && exit 0 - -incfiles='' -for f in "${INCLUDE_FILES[@]}"; do - incfiles="$incfiles"$'\n'"$f" -done - -excfiles='{' -for f in "${EXCLUDE_FILES[@]}"; do - excfiles="${excfiles}${f}," -done -excfiles="${excfiles}}" -[[ "$excfiles" == '{}' ]] && excfiles='' - -pushd "$UPDATE_DIR" >/dev/null -rm -rf "$PKGNAME" -git clone --depth 1 "https://aur.archlinux.org/${PKGNAME}.git" "$PKGNAME" - -cd "$PKGNAME" && prepare -for patch in "${PATCHES[@]}"; do - git apply "../${patch}" -done - -add_files=$(eval ls -1 --almost-all --ignore=${excfiles}) -add_files="${add_files}"$'\n'"${incfiles}" - -while read f; do - [[ -z "$f" ]] && continue - cp -av "$f" ../../ - (cd ../../ && git add "$f") -done <<< "$add_files" - -cd .. -rm -rf "$PKGNAME" -popd >/dev/null - -git commit -m "autoupdate: ${PKGNAME} to ${newpkgver} from aur" -git push diff --git a/yay/buildbot.update.d/update.sh b/yay/buildbot.update.d/update.sh new file mode 120000 index 0000000..7600931 --- /dev/null +++ b/yay/buildbot.update.d/update.sh @@ -0,0 +1 @@ +../../.buildbot/aur.hook.d/update.sh \ No newline at end of file