| author |  Andrew Kelley <andrew@ziglang.org> 2022-08-10 16:33:48-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2022-08-19 16:45:15-07:00 |
| log | 7346600517f5902316e5b8c179d8120b7854a5e1 |
| tree | 0bc320f6718171983c35e1e50057652ba2543b8e |
| parent | e3ccea70dd13ce94f5d2c96c7824fb743282447c |
CI: avoid concurrent jobs tripping over each other
3 files changed, 10 insertions(+), 10 deletions(-)
ci/zinc/linux_base.sh+4
| ... | @@ -25,3 +25,7 @@ DEBUG_STAGING="$WORKSPACE/_debug/staging" | ... | @@ -25,3 +25,7 @@ DEBUG_STAGING="$WORKSPACE/_debug/staging" |
| 25 | RELEASE_STAGING="$WORKSPACE/_release/staging" | 25 | RELEASE_STAGING="$WORKSPACE/_release/staging" |
| 26 | 26 | ||
| 27 | export PATH=$DEPS_LOCAL/bin:$PATH | 27 | export PATH=$DEPS_LOCAL/bin:$PATH |
| 28 | |||
| 29 | # Make the `zig version` number consistent. | ||
| 30 | # This will affect the cmake commands that follow. | ||
| 31 | git config core.abbrev 9 |
ci/zinc/linux_test_stage3_debug.sh+6-6
| ... | @@ -6,10 +6,6 @@ OLD_ZIG="$DEPS_LOCAL/bin/zig" | ... | @@ -6,10 +6,6 @@ OLD_ZIG="$DEPS_LOCAL/bin/zig" |
| 6 | TARGET="${ARCH}-linux-musl" | 6 | TARGET="${ARCH}-linux-musl" |
| 7 | MCPU="baseline" | 7 | MCPU="baseline" |
| 8 | 8 | ||
| 9 | # Make the `zig version` number consistent. | ||
| 10 | # This will affect the cmake command below. | ||
| 11 | git config core.abbrev 9 | ||
| 12 | |||
| 13 | echo "building stage3-debug with zig version $($OLD_ZIG version)" | 9 | echo "building stage3-debug with zig version $($OLD_ZIG version)" |
| 14 | 10 | ||
| 15 | # Override the cache directories so that we don't clobber with the release | 11 | # Override the cache directories so that we don't clobber with the release |
| ... | @@ -53,8 +49,12 @@ cd $WORKSPACE | ... | @@ -53,8 +49,12 @@ cd $WORKSPACE |
| 53 | stage3/bin/zig build -Dtarget=arm-linux-musleabihf | 49 | stage3/bin/zig build -Dtarget=arm-linux-musleabihf |
| 54 | 50 | ||
| 55 | echo "Looking for non-conforming code formatting..." | 51 | echo "Looking for non-conforming code formatting..." |
| 56 | echo "Formatting errors can be fixed by running 'zig fmt' on the files printed here." | 52 | stage3/bin/zig fmt --check . \ |
| 57 | stage3/bin/zig fmt --check . --exclude test/cases/ | 53 | --exclude test/cases/ \ |
| 54 | --exclude build-debug \ | ||
| 55 | --exclude build-release \ | ||
| 56 | --exclude "$ZIG_LOCAL_CACHE_DIR" \ | ||
| 57 | --exclude "$ZIG_GLOBAL_CACHE_DIR" | ||
| 58 | 58 | ||
| 59 | stage3/bin/zig build test \ | 59 | stage3/bin/zig build test \ |
| 60 | -fqemu \ | 60 | -fqemu \ |
ci/zinc/linux_test_stage3_release.sh-4
| ... | @@ -6,10 +6,6 @@ OLD_ZIG="$DEPS_LOCAL/bin/zig" | ... | @@ -6,10 +6,6 @@ OLD_ZIG="$DEPS_LOCAL/bin/zig" |
| 6 | TARGET="${ARCH}-linux-musl" | 6 | TARGET="${ARCH}-linux-musl" |
| 7 | MCPU="baseline" | 7 | MCPU="baseline" |
| 8 | 8 | ||
| 9 | # Make the `zig version` number consistent. | ||
| 10 | # This will affect the cmake command below. | ||
| 11 | git config core.abbrev 9 | ||
| 12 | |||
| 13 | echo "building stage3-release with zig version $($OLD_ZIG version)" | 9 | echo "building stage3-release with zig version $($OLD_ZIG version)" |
| 14 | 10 | ||
| 15 | export CC="$OLD_ZIG cc -target $TARGET -mcpu=$MCPU" | 11 | export CC="$OLD_ZIG cc -target $TARGET -mcpu=$MCPU" |