Skip to content

Commit f12e1f2

Browse files
committed
Lift timeout/retry logic into GitHub action
1 parent ef15757 commit f12e1f2

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

.github/workflows/continuous-integration-workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- uses: actions/checkout@v4
3939

4040
- name: run build script
41-
run: cd $GITHUB_WORKSPACE && ./scripts/ci_build_mac-amd64.sh
41+
run: cd $GITHUB_WORKSPACE && ./scripts/ci_build_mac-amd64.sh --allowed-final-target-build-attempts=8 --seconds-between-final-target-build-attempts=2
4242

4343
- uses: actions/upload-artifact@v4
4444
with:
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/checkout@v4
5454

5555
- name: run build script
56-
run: cd $GITHUB_WORKSPACE && bash ./scripts/ci_build_mac-arm64.sh
56+
run: cd $GITHUB_WORKSPACE && bash ./scripts/ci_build_mac-arm64.sh --allowed-final-target-build-attempts=8 --seconds-between-final-target-build-attempts=2
5757

5858
- uses: actions/upload-artifact@v4
5959
with:

scripts/ci_build_mac-amd64.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ set -xeuo pipefail
99
OSCDEPS_BUILD_ALWAYS=ON ./scripts/build.py \
1010
--osx-architectures=x86_64 \
1111
--osx-deployment-target=14.5 \
12-
--allowed-final-target-build-attempts=8 \
13-
--seconds-between-final-target-build-attempts=2
12+
"$@"
1413

scripts/ci_build_mac-arm64.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ set -xeuo pipefail
99
OSCDEPS_BUILD_ALWAYS=ON ./scripts/build.py \
1010
--osx-architectures=arm64 \
1111
--osx-deployment-target=14.5 \
12-
--allowed-final-target-build-attempts=8 \
13-
--seconds-between-final-target-build-attempts=2
12+
"$@"
1413

scripts/ci_build_ubuntu22.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ set -xeuo pipefail
1111
export OSCDEPS_BUILD_ALWAYS=${OSCDEPS_BUILD_ALWAYS:-ON}
1212

1313
# Run buildscript under virtual desktop with `xvfb-run` (for UI tests)
14-
CC=gcc-12 CXX=g++-12 OSC_BUILD_CONCURRENCY=$(nproc) xvfb-run ./scripts/build.py
14+
CC=gcc-12 CXX=g++-12 OSC_BUILD_CONCURRENCY=$(nproc) xvfb-run ./scripts/build.py "$@"
15+

0 commit comments

Comments
 (0)