Compare commits

...

2 commits

Author SHA1 Message Date
779b94d8a5
fix patch
Some checks failed
/ build-x86_64 (pull_request) Failing after 26s
/ lint (pull_request) Failing after 24s
2024-08-11 17:42:50 -04:00
1584ceb772
split two jobs 2024-08-11 17:42:42 -04:00
3 changed files with 26 additions and 20 deletions

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..048bf54 index c3b8f7a..1da3937
--- 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 @@
@ -42,11 +42,14 @@ index c3b8f7a..048bf54
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,11 @@ apply_offset_limit() { @@ -118,7 +120,14 @@ apply_offset_limit() {
} }
setup_system() { setup_system() {
- doas sh -c "echo $MIRROR/$(get_release)/main > /etc/apk/repositories" - doas sh -c "echo $MIRROR/$(get_release)/main > /etc/apk/repositories"
+ local repos='' repo=''
+ local release
+
+ release=$(get_release) + release=$(get_release)
+ for repo in $ALPINE_REPOS; do + for repo in $ALPINE_REPOS; do
+ [ "$release" != "edge" ] && [ "$repo" == "testing" ] && continue + [ "$release" != "edge" ] && [ "$repo" == "testing" ] && continue

View file

@ -3,24 +3,6 @@ on:
types: [ assigned, opened, synchronize, reopened ] types: [ assigned, opened, synchronize, reopened ]
jobs: jobs:
lint:
run-name: lint
runs-on: x86_64
container:
image: alpinelinux/apkbuild-lint-tools:latest
env:
CI_PROJECT_DIR: ${{ github.workspace }}
CI_DEBUG_BUILD: ${{ runner.debug }}
CI_MERGE_REQUEST_PROJECT_URL: ${{ github.server_url }}/${{ github.repository }}
CI_MERGE_REQUEST_TARGET_BRANCH_NAME: ${{ github.base_ref }}
steps:
- run: doas apk add nodejs git
- uses: actions/checkout@v4
with:
fetch-depth: 500
- run: lint
continue-on-error: true
build-x86_64: build-x86_64:
runs-on: x86_64 runs-on: x86_64
container: container:

View file

@ -0,0 +1,21 @@
on:
pull_request:
types: [ assigned, opened, synchronize, reopened ]
jobs:
lint:
run-name: lint
runs-on: x86_64
container:
image: alpinelinux/apkbuild-lint-tools:latest
env:
CI_PROJECT_DIR: ${{ github.workspace }}
CI_DEBUG_BUILD: ${{ runner.debug }}
CI_MERGE_REQUEST_PROJECT_URL: ${{ github.server_url }}/${{ github.repository }}
CI_MERGE_REQUEST_TARGET_BRANCH_NAME: ${{ github.base_ref }}
steps:
- run: doas apk add nodejs git
- uses: actions/checkout@v4
with:
fetch-depth: 500
- run: lint