forge/ayaports
1
0
Fork 0
Code Issues 25 Pull requests 11 Projects Releases Packages Wiki Activity Actions

fix repo setting
Some checks failed
/ build-x86_64 (pull_request) Successful in 43s
Details
/ lint (pull_request) Failing after 23s
Details

Browse source
This commit is contained in:
Antoine Martin 2024-08-11 17:49:53 -04:00
parent 9039a87c7c
commit 27bdf54ea6
Signed by: forge
GPG key ID: D62A472A4AA7D541
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.forgejo/patches/build.patch
View file

@ -1,7 +1,7 @@
diff --git a/usr/local/bin/build.sh.orig b/usr/local/bin/build.sh diff --git a/usr/local/bin/build.sh.orig b/usr/local/bin/build.sh
old mode 100644 old mode 100644
new mode 100755 new mode 100755
index c3b8f7a..1da3937 index c3b8f7a..f609018
--- a/usr/local/bin/build.sh.orig --- a/usr/local/bin/build.sh.orig
+++ b/usr/local/bin/build.sh +++ b/usr/local/bin/build.sh
@@ -7,13 +7,15 @@ @@ -7,13 +7,15 @@
@ -33,7 +33,7 @@ index c3b8f7a..1da3937
*) die "Branch \"$BASEBRANCH\" not supported!" *) die "Branch \"$BASEBRANCH\" not supported!"
esac esac
} }
@@ -101,7 +103,7 @@ set_repositories_for() { @@ -101,11 +103,11 @@ set_repositories_for() {
release=$(get_release) release=$(get_release)
for repo in $REPOS; do for repo in $REPOS; do
[ "$repo" = "non-free" ] && continue [ "$repo" = "non-free" ] && continue
@ -42,7 +42,12 @@ index c3b8f7a..1da3937
repos="$repos $MIRROR/$release/$repo $REPODEST/$repo" repos="$repos $MIRROR/$release/$repo $REPODEST/$repo"
[ "$repo" = "$target_repo" ] && break [ "$repo" = "$target_repo" ] && break
done done
@@ -118,7 +120,14 @@ apply_offset_limit() { - 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 +120,15 @@ apply_offset_limit() {
} }
setup_system() { setup_system() {
@ -55,6 +60,7 @@ index c3b8f7a..1da3937
+ [ "$release" != "edge" ] && [ "$repo" == "testing" ] && continue + [ "$release" != "edge" ] && [ "$repo" == "testing" ] && continue
+ repos="$repos $ALPINE_MIRROR/$release/$repo" + repos="$repos $ALPINE_MIRROR/$release/$repo"
+ done + done
+ doas sh -c "printf '%s\n' $repos > /etc/apk/repositories"
doas apk -U upgrade -a || apk fix || die "Failed to up/downgrade system" doas apk -U upgrade -a || apk fix || die "Failed to up/downgrade system"
abuild-keygen -ain abuild-keygen -ain
doas sed -i -E 's/export JOBS=[0-9]+$/export JOBS=$(nproc)/' /etc/abuild.conf doas sed -i -E 's/export JOBS=[0-9]+$/export JOBS=$(nproc)/' /etc/abuild.conf