From 1a427d854dfca9d48a739b1f83852ce64e9ea4c7 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 30 Nov 2024 20:52:25 -0500 Subject: [PATCH 1/3] forgejo-ci: drop 3.19 builder, add 3.21 --- .../workflows/{build-v3.19.yaml => build-v3.21.yaml} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename .forgejo/workflows/{build-v3.19.yaml => build-v3.21.yaml} (93%) diff --git a/.forgejo/workflows/build-v3.19.yaml b/.forgejo/workflows/build-v3.21.yaml similarity index 93% rename from .forgejo/workflows/build-v3.19.yaml rename to .forgejo/workflows/build-v3.21.yaml index 2561981..29ddff9 100644 --- a/.forgejo/workflows/build-v3.19.yaml +++ b/.forgejo/workflows/build-v3.21.yaml @@ -3,7 +3,7 @@ on: types: [ assigned, opened, synchronize, reopened ] jobs: - build-v3.19: + build-v3.21: runs-on: x86_64 container: image: alpinelinux/alpine-gitlab-ci:latest @@ -12,7 +12,7 @@ jobs: CI_DEBUG_BUILD: ${{ runner.debug }} CI_MERGE_REQUEST_PROJECT_URL: ${{ github.server_url }}/${{ github.repository }} CI_MERGE_REQUEST_TARGET_BRANCH_NAME: ${{ github.base_ref }} - CI_ALPINE_TARGET: v3.19 + CI_ALPINE_TARGET: v3.21 steps: - name: Environment setup run: | @@ -33,14 +33,14 @@ jobs: name: package path: packages - deploy-v3.19: - needs: [build-v3.19] + deploy-v3.21: + needs: [build-v3.21] runs-on: x86_64 container: image: alpine:latest env: + CI_ALPINE_TARGET: v3.21 CI_ALPINE_REPO: 'https://ayakael.net/api/packages/forge/alpine' - CI_ALPINE_TARGET: v3.19 FORGE_REPO_TOKEN: ${{ secrets.FORGE_REPO_TOKEN }} FORGE_REPO_USER: ${{ vars.FORGE_REPO_USER }} steps: -- 2.45.2 From 3254fe973803d4310ea9cbfde3828b68eaffb549 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 30 Nov 2024 20:56:01 -0500 Subject: [PATCH 2/3] *: rebuild for 3.21 --- qubes-app-linux-druide-antidote/APKBUILD | 2 +- qubes-db-vm/APKBUILD | 2 +- qubes-gpg-split/APKBUILD | 2 +- qubes-input-proxy/APKBUILD | 2 +- qubes-libvchan-xen/APKBUILD | 2 +- qubes-meta-packages/APKBUILD | 2 +- qubes-pass/APKBUILD | 2 +- qubes-usb-proxy/APKBUILD | 2 +- qubes-vm-core/APKBUILD | 2 +- qubes-vm-gui-dev/APKBUILD | 2 +- qubes-vm-gui/APKBUILD | 2 +- qubes-vm-qrexec/APKBUILD | 2 +- qubes-vm-utils/APKBUILD | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qubes-app-linux-druide-antidote/APKBUILD b/qubes-app-linux-druide-antidote/APKBUILD index df073e2..cf111c5 100644 --- a/qubes-app-linux-druide-antidote/APKBUILD +++ b/qubes-app-linux-druide-antidote/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-app-linux-druide-antidote pkgver=0.0.1_git20240201 _gittag=c724c88aa2a20b1e422b464499015ff05753316d -pkgrel=2 +pkgrel=3 arch="noarch" pkgdesc="Qubes Druide-Antidote is a Qubes Application. It send a file to the Antidote Qube, invoke Antidote, and retrieve the file" url=https://github.com/neowutran/qubes-app-linux-druide-antidote diff --git a/qubes-db-vm/APKBUILD b/qubes-db-vm/APKBUILD index bf20d45..b577fe2 100644 --- a/qubes-db-vm/APKBUILD +++ b/qubes-db-vm/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-db-vm subpackages="$pkgname-openrc" pkgver=4.2.6 -pkgrel=1 +pkgrel=2 _gittag="v$pkgver" pkgdesc="QubesDB libs and daemon service." arch="x86_64" diff --git a/qubes-gpg-split/APKBUILD b/qubes-gpg-split/APKBUILD index 8ab57fd..ff37869 100644 --- a/qubes-gpg-split/APKBUILD +++ b/qubes-gpg-split/APKBUILD @@ -4,7 +4,7 @@ pkgname=qubes-gpg-split subpackages="$pkgname-doc" pkgver=2.0.75 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="Used Qubes AppVM as a “smart card”" arch="x86_64" url="https://github.com/QubesOS/qubes-app-linux-split-gpg" diff --git a/qubes-input-proxy/APKBUILD b/qubes-input-proxy/APKBUILD index 1e206d6..fe51824 100644 --- a/qubes-input-proxy/APKBUILD +++ b/qubes-input-proxy/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-input-proxy pkgver=1.0.39 _gittag=v$pkgver -pkgrel=0 +pkgrel=1 pkgdesc="The Qubes service for proxying input devices" arch="x86_64" url="https://github.com/QubesOS/qubes-app-linux-input-proxy" diff --git a/qubes-libvchan-xen/APKBUILD b/qubes-libvchan-xen/APKBUILD index 8a76bce..d1ebb7f 100644 --- a/qubes-libvchan-xen/APKBUILD +++ b/qubes-libvchan-xen/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoine Martin (ayakael) pkgname=qubes-libvchan-xen pkgver=4.2.4 -pkgrel=1 +pkgrel=2 _gittag=v$pkgver pkgdesc="The Qubes core libraries for installation inside a Qubes Dom0 and VM." arch="x86_64" diff --git a/qubes-meta-packages/APKBUILD b/qubes-meta-packages/APKBUILD index 7a16163..7f5f3f2 100644 --- a/qubes-meta-packages/APKBUILD +++ b/qubes-meta-packages/APKBUILD @@ -7,7 +7,7 @@ subpackages=" " pkgver=4.3.0 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="Meta packages for Qubes-specific components" arch="noarch" url="https://github.com/QubesOS/qubes-meta-packages" diff --git a/qubes-pass/APKBUILD b/qubes-pass/APKBUILD index 0f63e26..98f74cb 100644 --- a/qubes-pass/APKBUILD +++ b/qubes-pass/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-pass pkgver=0.1.0 _gittag="v$pkgver" -pkgrel=4 +pkgrel=5 pkgdesc="An inter-VM password manager for Qubes OS" arch="noarch" url="https://github.com/Rudd-O/qubes-pass" diff --git a/qubes-usb-proxy/APKBUILD b/qubes-usb-proxy/APKBUILD index 4dacfe2..e14dcf2 100644 --- a/qubes-usb-proxy/APKBUILD +++ b/qubes-usb-proxy/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-usb-proxy pkgver=1.3.2 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="The Qubes service for proxying USB devices" arch="noarch" url="https://github.com/QubesOS/qubes-app-linux-usb-proxy" diff --git a/qubes-vm-core/APKBUILD b/qubes-vm-core/APKBUILD index 32b458a..7e5039d 100644 --- a/qubes-vm-core/APKBUILD +++ b/qubes-vm-core/APKBUILD @@ -9,7 +9,7 @@ subpackages=" $pkgname-pyc " pkgver=4.3.11 -pkgrel=0 +pkgrel=1 _gittag="v$pkgver" pkgdesc="The Qubes core files for installation inside a Qubes VM." arch="x86_64" diff --git a/qubes-vm-gui-dev/APKBUILD b/qubes-vm-gui-dev/APKBUILD index 952ea31..a6b5e38 100644 --- a/qubes-vm-gui-dev/APKBUILD +++ b/qubes-vm-gui-dev/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-vm-gui-dev pkgver=4.3.0 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="Common files for Qubes GUI - protocol headers." arch="noarch" url="https://github.com/QubesOS/qubes-gui-common" diff --git a/qubes-vm-gui/APKBUILD b/qubes-vm-gui/APKBUILD index 4526e96..f142e37 100644 --- a/qubes-vm-gui/APKBUILD +++ b/qubes-vm-gui/APKBUILD @@ -6,7 +6,7 @@ subpackages=" qubes-vm-pipewire $pkgname-openrc" pkgver=4.3.1 -pkgrel=0 +pkgrel=1 _gittag="v$pkgver" pkgdesc="The Qubes GUI Agent for AppVMs" arch="x86_64" diff --git a/qubes-vm-qrexec/APKBUILD b/qubes-vm-qrexec/APKBUILD index 3f3f959..9ea75f5 100644 --- a/qubes-vm-qrexec/APKBUILD +++ b/qubes-vm-qrexec/APKBUILD @@ -4,7 +4,7 @@ pkgname=qubes-vm-qrexec subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc" pkgver=4.3.0 _gittag="v$pkgver" -pkgrel=1 +pkgrel=2 pkgdesc="The Qubes qrexec files (qube side)" arch="x86_64" url="https://github.com/QubesOS/qubes-core-qrexec" diff --git a/qubes-vm-utils/APKBUILD b/qubes-vm-utils/APKBUILD index 4b2aaaf..f193c61 100644 --- a/qubes-vm-utils/APKBUILD +++ b/qubes-vm-utils/APKBUILD @@ -7,7 +7,7 @@ subpackages=" $pkgname-pyc " pkgver=4.3.5 -pkgrel=0 +pkgrel=1 _gittag="v$pkgver" pkgdesc="Common Linux files for Qubes VM." arch="x86_64" -- 2.45.2 From e867721ad65ddf4434e8874b1bbd0f7cb03e6098 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 30 Nov 2024 21:03:05 -0500 Subject: [PATCH 3/3] forgejo: import build.sh in repo --- .forgejo/bin/build.sh | 268 ++++++++++++++++++++++++++++ .forgejo/patches/build.patch | 140 --------------- .forgejo/workflows/build-edge.yaml | 4 +- .forgejo/workflows/build-v3.20.yaml | 4 +- .forgejo/workflows/build-v3.21.yaml | 4 +- 5 files changed, 271 insertions(+), 149 deletions(-) create mode 100755 .forgejo/bin/build.sh delete mode 100644 .forgejo/patches/build.patch diff --git a/.forgejo/bin/build.sh b/.forgejo/bin/build.sh new file mode 100755 index 0000000..c065c38 --- /dev/null +++ b/.forgejo/bin/build.sh @@ -0,0 +1,268 @@ +#!/bin/sh +# shellcheck disable=SC3043 + +. /usr/local/lib/functions.sh + +# shellcheck disable=SC3040 +set -eu -o pipefail + +readonly APORTSDIR=$CI_PROJECT_DIR +readonly REPOS="main community testing" +readonly ARCH=$(apk --print-arch) +# gitlab variables +readonly BASEBRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME + +: "${REPODEST:=$HOME/packages}" +: "${MIRROR:=https://ayakael.net/api/packages/forge/alpine}" +: "${ALPINE_MIRROR:=http://dl-cdn.alpinelinux.org/alpine}" +: "${MAX_ARTIFACT_SIZE:=300000000}" #300M +: "${CI_DEBUG_BUILD:=}" + +: "${CI_ALPINE_BUILD_OFFSET:=0}" +: "${CI_ALPINE_BUILD_LIMIT:=9999}" + +msg() { + local color=${2:-green} + case "$color" in + red) color="31";; + green) color="32";; + yellow) color="33";; + blue) color="34";; + *) color="32";; + esac + printf "\033[1;%sm>>>\033[1;0m %s\n" "$color" "$1" | xargs >&2 +} + +verbose() { + echo "> " "$@" + # shellcheck disable=SC2068 + $@ +} + +debugging() { + [ -n "$CI_DEBUG_BUILD" ] +} + +debug() { + if debugging; then + verbose "$@" + fi +} + +die() { + msg "$1" red + exit 1 +} + +capture_stderr() { + "$@" 2>&1 +} + +report() { + report=$1 + + reportsdir=$APORTSDIR/logs/ + mkdir -p "$reportsdir" + + tee -a "$reportsdir/$report.log" +} + +get_release() { + echo $CI_ALPINE_TARGET +} + + +get_qubes_release() { + case $BASEBRANCH in + r*) echo $BASEBRANCH;; + main) echo r4.3;; + esac +} + +changed_aports() { + : "${APORTSDIR?APORTSDIR missing}" + : "${BASEBRANCH?BASEBRANCH missing}" + + cd "$APORTSDIR" + local aports + + aports=$(git diff --name-only --diff-filter=ACMR \ + "$BASEBRANCH"...HEAD -- "*/APKBUILD" | xargs -rn1 dirname) + + # shellcheck disable=2086 + ap builddirs -d "$APORTSDIR" $aports 2>/dev/null | xargs -rn1 basename +} + + +build_aport() { + local repo="$1" aport="$2" + cd "$APORTSDIR/$repo/$aport" + if abuild -r 2>&1 | report "build-$aport"; then + checkapk 2>&1 | report "checkapk-$aport" || true + aport_ok="$aport_ok $repo/$aport" + else + aport_ng="$aport_ng $repo/$aport" + fi +} + +check_aport() { + local repo="$1" aport="$2" + cd "$APORTSDIR/$repo/$aport" + if ! abuild check_arch 2>/dev/null; then + aport_na="$aport_na $repo/$aport" + return 1 + fi +} + +set_repositories_for() { + local target_repo="$1" repos='' repo='' + local release + + release=$(get_release) + for repo in qubes-$(get_qubes_release); do + [ "$repo" = "non-free" ] && continue + [ "$release" == "edge" ] && [ "$repo" == "backports" ] && continue + repos="$repos $MIRROR/$release/$repo $REPODEST/$repo" + [ "$repo" = "$target_repo" ] && break + done + doas sh -c "printf '%s\n' $repos >> /etc/apk/repositories" + doas apk update || true +} + +apply_offset_limit() { + start=$1 + limit=$2 + end=$((start+limit)) + + sed -n "$((start+1)),${end}p" +} + +setup_system() { + local repos='' repo='' + local release + + release=$(get_release) + for repo in $REPOS; do + [ "$release" != "edge" ] && [ "$repo" == "testing" ] && continue + repos="$repos $ALPINE_MIRROR/$release/$repo" + done + doas sh -c "printf '%s\n' $repos > /etc/apk/repositories" + doas apk -U upgrade -a || apk fix || die "Failed to up/downgrade system" + abuild-keygen -ain + doas sed -i -E 's/export JOBS=[0-9]+$/export JOBS=$(nproc)/' /etc/abuild.conf + ( . /usr/share/abuild/default.conf; . /etc/abuild.conf; echo "Building with ${JOBS-1} jobs" ) + mkdir -p "$REPODEST" + git config --global init.defaultBranch master +} + +sysinfo() { + printf ">>> Host system information (arch: %s, release: %s) <<<\n" "$ARCH" "$(get_release)" + printf "- Number of Cores: %s\n" "$(nproc)" + printf "- Memory: %s Gb\n" "$(awk '/^MemTotal/ {print ($2/1024/1024)}' /proc/meminfo)" + printf "- Free space: %s\n" "$(df -hP / | awk '/\/$/ {print $4}')" +} + +copy_artifacts() { + cd "$APORTSDIR" + + packages_size="$(du -sk "$REPODEST" | awk '{print $1 * 1024}')" + if [ -z "$packages_size" ]; then + return + fi + + echo "Artifact size: $packages_size bytes" + + mkdir -p keys/ packages/ + + if [ "$packages_size" -lt $MAX_ARTIFACT_SIZE ]; then + msg "Copying packages for artifact upload" + cp -ar "$REPODEST"/* packages/ 2>/dev/null + cp ~/.abuild/*.rsa.pub keys/ + else + msg "Artifact size $packages_size larger than max ($MAX_ARTIFACT_SIZE), skipping uploading them" yellow + fi +} + +section_start setup "Setting up the system" collapse + +if debugging; then + set -x +fi + +aport_ok= +aport_na= +aport_ng= +failed= + +sysinfo || true +setup_system || die "Failed to setup system" + +# git no longer allows to execute in repositories owned by different users +doas chown -R buildozer: . + +fetch_flags="-qn" +debugging && fetch_flags="-v" + +git fetch $fetch_flags "$CI_MERGE_REQUEST_PROJECT_URL" \ + "+refs/heads/$BASEBRANCH:refs/heads/$BASEBRANCH" + +if debugging; then + merge_base=$(git merge-base "$BASEBRANCH" HEAD) || echo "Could not determine merge-base" + echo "Merge base: $merge_base" + git --version + git config -l + [ -n "$merge_base" ] && git tag -f merge-base "$merge_base" + git --no-pager log -200 --oneline --graph --decorate --all +fi + +section_end setup + +build_start=$CI_ALPINE_BUILD_OFFSET +build_limit=$CI_ALPINE_BUILD_LIMIT + +set_repositories_for $(get_qubes_release) +built_aports=0 +changed_aports_in_repo=$(changed_aports $BASEBRANCH) +changed_aports_in_repo_count=$(echo "$changed_aports_in_repo" | wc -l) +changed_aports_to_build=$(echo "$changed_aports_in_repo" | apply_offset_limit "$build_start" "$build_limit") + +msg "Changed aports:" +# shellcheck disable=SC2086 # Splitting is expected here +printf " - %s\n" $changed_aports_to_build +for pkgname in $changed_aports_to_build; do + section_start "build_$pkgname" "Building package $pkgname" + built_aports=$((built_aports+1)) + if check_aport . "$pkgname"; then + build_aport . "$pkgname" + fi + section_end "build_$pkgname" +done + +section_start artifacts "Handeling artifacts" collapse +copy_artifacts || true +section_end artifacts + +section_start summary "Build summary" + +echo "### Build summary ###" + +for ok in $aport_ok; do + msg "$ok: build succesfully" +done + +for na in $aport_na; do + msg "$na: disabled for $ARCH" yellow +done + +for ng in $aport_ng; do + msg "$ng: build failed" red + failed=true +done +section_end summary + +if [ "$failed" = true ]; then + exit 1 +elif [ -z "$aport_ok" ]; then + msg "No packages found to be built." yellow +fi + diff --git a/.forgejo/patches/build.patch b/.forgejo/patches/build.patch deleted file mode 100644 index 81015ef..0000000 --- a/.forgejo/patches/build.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff --git a/usr/local/bin/build.sh.orig b/usr/local/bin/build.sh -old mode 100644 -new mode 100755 -index c3b8f7a..0b1c9a5 ---- a/usr/local/bin/build.sh.orig -+++ b/usr/local/bin/build.sh -@@ -7,13 +7,14 @@ - set -eu -o pipefail - - readonly APORTSDIR=$CI_PROJECT_DIR --readonly REPOS="main community testing non-free" -+readonly REPOS="main community testing" - readonly ARCH=$(apk --print-arch) - # gitlab variables - readonly BASEBRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME - - : "${REPODEST:=$HOME/packages}" --: "${MIRROR:=https://dl-cdn.alpinelinux.org/alpine}" -+: "${MIRROR:=https://ayakael.net/api/packages/forge/alpine}" -+: "${ALPINE_MIRROR:=http://dl-cdn.alpinelinux.org/alpine}" - : "${MAX_ARTIFACT_SIZE:=300000000}" #300M - : "${CI_DEBUG_BUILD:=}" - -@@ -67,13 +68,32 @@ report() { - } - - get_release() { -+ echo $CI_ALPINE_TARGET -+} -+ -+ -+get_qubes_release() { - case $BASEBRANCH in -- *-stable) echo v"${BASEBRANCH%-*}";; -- master) echo edge;; -- *) die "Branch \"$BASEBRANCH\" not supported!" -+ r*) echo $BASEBRANCH;; -+ main) echo r4.3;; - esac - } - -+changed_aports() { -+ : "${APORTSDIR?APORTSDIR missing}" -+ : "${BASEBRANCH?BASEBRANCH missing}" -+ -+ cd "$APORTSDIR" -+ local aports -+ -+ aports=$(git diff --name-only --diff-filter=ACMR \ -+ "$BASEBRANCH"...HEAD -- "*/APKBUILD" | xargs -rn1 dirname) -+ -+ # shellcheck disable=2086 -+ ap builddirs -d "$APORTSDIR" $aports 2>/dev/null | xargs -rn1 basename -+} -+ -+ - build_aport() { - local repo="$1" aport="$2" - cd "$APORTSDIR/$repo/$aport" -@@ -99,13 +119,13 @@ set_repositories_for() { - local release - - release=$(get_release) -- for repo in $REPOS; do -+ for repo in qubes-$(get_qubes_release); do - [ "$repo" = "non-free" ] && continue -- [ "$release" != "edge" ] && [ "$repo" == "testing" ] && continue -+ [ "$release" == "edge" ] && [ "$repo" == "backports" ] && continue - repos="$repos $MIRROR/$release/$repo $REPODEST/$repo" - [ "$repo" = "$target_repo" ] && break - done -- doas sh -c "printf '%s\n' $repos > /etc/apk/repositories" -+ doas sh -c "printf '%s\n' $repos >> /etc/apk/repositories" - doas apk update - } - -@@ -118,7 +138,15 @@ apply_offset_limit() { - } - - setup_system() { -- doas sh -c "echo $MIRROR/$(get_release)/main > /etc/apk/repositories" -+ local repos='' repo='' -+ local release -+ -+ release=$(get_release) -+ for repo in $REPOS; do -+ [ "$release" != "edge" ] && [ "$repo" == "testing" ] && continue -+ repos="$repos $ALPINE_MIRROR/$release/$repo" -+ done -+ doas sh -c "printf '%s\n' $repos > /etc/apk/repositories" - doas apk -U upgrade -a || apk fix || die "Failed to up/downgrade system" - abuild-keygen -ain - doas sed -i -E 's/export JOBS=[0-9]+$/export JOBS=$(nproc)/' /etc/abuild.conf -@@ -192,32 +220,22 @@ section_end setup - build_start=$CI_ALPINE_BUILD_OFFSET - build_limit=$CI_ALPINE_BUILD_LIMIT - --for repo in $(changed_repos); do -- set_repositories_for "$repo" -- built_aports=0 -- changed_aports_in_repo=$(changed_aports "$repo") -- changed_aports_in_repo_count=$(echo "$changed_aports_in_repo" | wc -l) -- changed_aports_to_build=$(echo "$changed_aports_in_repo" | apply_offset_limit "$build_start" "$build_limit") -+set_repositories_for $(get_qubes_release) -+built_aports=0 -+changed_aports_in_repo=$(changed_aports $BASEBRANCH) -+changed_aports_in_repo_count=$(echo "$changed_aports_in_repo" | wc -l) -+changed_aports_to_build=$(echo "$changed_aports_in_repo" | apply_offset_limit "$build_start" "$build_limit") - -- msg "Changed aports in $repo:" -- # shellcheck disable=SC2086 # Splitting is expected here -- printf " - %s\n" $changed_aports_to_build -- for pkgname in $changed_aports_to_build; do -- section_start "build_$pkgname" "Building package $pkgname" -- built_aports=$((built_aports+1)) -- if check_aport "$repo" "$pkgname"; then -- build_aport "$repo" "$pkgname" -- fi -- section_end "build_$pkgname" -- done -- -- build_start=$((build_start-(changed_aports_in_repo_count-built_aports))) -- build_limit=$((build_limit-built_aports)) -- -- if [ $build_limit -le 0 ]; then -- msg "Limit reached, breaking" -- break -+msg "Changed aports:" -+# shellcheck disable=SC2086 # Splitting is expected here -+printf " - %s\n" $changed_aports_to_build -+for pkgname in $changed_aports_to_build; do -+ section_start "build_$pkgname" "Building package $pkgname" -+ built_aports=$((built_aports+1)) -+ if check_aport . "$pkgname"; then -+ build_aport . "$pkgname" - fi -+ section_end "build_$pkgname" - done - - section_start artifacts "Handeling artifacts" collapse diff --git a/.forgejo/workflows/build-edge.yaml b/.forgejo/workflows/build-edge.yaml index 91f86a4..5ee48ea 100644 --- a/.forgejo/workflows/build-edge.yaml +++ b/.forgejo/workflows/build-edge.yaml @@ -24,9 +24,7 @@ jobs: with: fetch-depth: 500 - name: Package build - run: | - doas patch -d / -p1 -i ${{ github.workspace }}/.forgejo/patches/build.patch - build.sh + run: ${{ github.workspace }}/.forgejo/bin/build.sh - name: Package upload uses: forgejo/upload-artifact@v3 with: diff --git a/.forgejo/workflows/build-v3.20.yaml b/.forgejo/workflows/build-v3.20.yaml index d693f55..573aa23 100644 --- a/.forgejo/workflows/build-v3.20.yaml +++ b/.forgejo/workflows/build-v3.20.yaml @@ -24,9 +24,7 @@ jobs: with: fetch-depth: 500 - name: Package build - run: | - doas patch -d / -p1 -i ${{ github.workspace }}/.forgejo/patches/build.patch - build.sh + run: ${{ github.workspace }}/.forgejo/bin/build.sh - name: Package upload uses: forgejo/upload-artifact@v3 with: diff --git a/.forgejo/workflows/build-v3.21.yaml b/.forgejo/workflows/build-v3.21.yaml index 29ddff9..6ed7279 100644 --- a/.forgejo/workflows/build-v3.21.yaml +++ b/.forgejo/workflows/build-v3.21.yaml @@ -24,9 +24,7 @@ jobs: with: fetch-depth: 500 - name: Package build - run: | - doas patch -d / -p1 -i ${{ github.workspace }}/.forgejo/patches/build.patch - build.sh + run: ${{ github.workspace }}/.forgejo/bin/build.sh - name: Package upload uses: forgejo/upload-artifact@v3 with: -- 2.45.2