diff --git a/ci/zinc/linux_base.sh b/ci/zinc/linux_base.sh index f1e992425832d1919a967b2ea98646b7206cd18c..9a757c8197f996d46de2154196a842210afdeaa1 100755 --- a/ci/zinc/linux_base.sh +++ b/ci/zinc/linux_base.sh @@ -25,3 +25,7 @@ DEBUG_STAGING="$WORKSPACE/_debug/staging" RELEASE_STAGING="$WORKSPACE/_release/staging" export PATH=$DEPS_LOCAL/bin:$PATH + +# Make the `zig version` number consistent. +# This will affect the cmake commands that follow. +git config core.abbrev 9 diff --git a/ci/zinc/linux_test_stage3_debug.sh b/ci/zinc/linux_test_stage3_debug.sh index 2ca2f7bad72737a8bc013f6248e241ad3b899f27..2bacf6d838e33747faf02485738242fae027ad62 100755 --- a/ci/zinc/linux_test_stage3_debug.sh +++ b/ci/zinc/linux_test_stage3_debug.sh @@ -6,10 +6,6 @@ OLD_ZIG="$DEPS_LOCAL/bin/zig" TARGET="${ARCH}-linux-musl" MCPU="baseline" -# Make the `zig version` number consistent. -# This will affect the cmake command below. -git config core.abbrev 9 - echo "building stage3-debug with zig version $($OLD_ZIG version)" # Override the cache directories so that we don't clobber with the release @@ -53,8 +49,12 @@ cd $WORKSPACE stage3/bin/zig build -Dtarget=arm-linux-musleabihf echo "Looking for non-conforming code formatting..." -echo "Formatting errors can be fixed by running 'zig fmt' on the files printed here." -stage3/bin/zig fmt --check . --exclude test/cases/ +stage3/bin/zig fmt --check . \ + --exclude test/cases/ \ + --exclude build-debug \ + --exclude build-release \ + --exclude "$ZIG_LOCAL_CACHE_DIR" \ + --exclude "$ZIG_GLOBAL_CACHE_DIR" stage3/bin/zig build test \ -fqemu \ diff --git a/ci/zinc/linux_test_stage3_release.sh b/ci/zinc/linux_test_stage3_release.sh index dd906f70fbce45d1088851ddccb7bbc3adcea474..d3532e0976dc9ebb59ab1155321e46fe08250632 100755 --- a/ci/zinc/linux_test_stage3_release.sh +++ b/ci/zinc/linux_test_stage3_release.sh @@ -6,10 +6,6 @@ OLD_ZIG="$DEPS_LOCAL/bin/zig" TARGET="${ARCH}-linux-musl" MCPU="baseline" -# Make the `zig version` number consistent. -# This will affect the cmake command below. -git config core.abbrev 9 - echo "building stage3-release with zig version $($OLD_ZIG version)" export CC="$OLD_ZIG cc -target $TARGET -mcpu=$MCPU"