diff --git a/usr/local/bin/build.sh.orig b/usr/local/bin/build.sh old mode 100644 new mode 100755 index c3b8f7a..a54e88c --- a/usr/local/bin/build.sh.orig +++ b/usr/local/bin/build.sh @@ -7,13 +7,15 @@ set -eu -o pipefail readonly APORTSDIR=$CI_PROJECT_DIR -readonly REPOS="main community testing non-free" +readonly REPOS="backports user" +readonly ALPINE_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://lab.ilot.io/ayakael/repo-apk/-/raw}" +: "${ALPINE_MIRROR:=http://dl-cdn.alpinelinux.org/alpine} : "${MAX_ARTIFACT_SIZE:=300000000}" #300M : "${CI_DEBUG_BUILD:=}" @@ -68,8 +70,8 @@ report() { get_release() { case $BASEBRANCH in - *-stable) echo v"${BASEBRANCH%-*}";; - master) echo edge;; + v*) echo v"${BASEBRANCH%-*}";; + edge) echo edge;; *) die "Branch \"$BASEBRANCH\" not supported!" esac } @@ -101,7 +103,7 @@ set_repositories_for() { release=$(get_release) for repo in $REPOS; 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 @@ -118,7 +120,10 @@ apply_offset_limit() { } setup_system() { - doas sh -c "echo $MIRROR/$(get_release)/main > /etc/apk/repositories" + for repo in $ALPINE_REPOS; do + [ "$release" != "edge" ] && [ "$repo" == "testing" ] && continue + repos="$repos $ALPINE_MIRROR/$release/$repo" + done 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