From a0a420a51bc251ad668b845e2b7efe33c80564c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Thu, 10 Sep 2026 08:53:28 +0200 Subject: [PATCH 1/2] stage1: remove unused skip_non_native field --- stage1/config.zig.in | 1 - 1 file changed, 1 deletion(-) diff --git a/stage1/config.zig.in b/stage1/config.zig.in index 087585cd7eee9b1ea4bec29e8af50eb29fa64084..d975f286a0fd52360326971d73f3b4a294169df1 100644 --- a/stage1/config.zig.in +++ b/stage1/config.zig.in @@ -10,7 +10,6 @@ pub const enable_logging = false; pub const enable_link_snapshots = false; pub const enable_tracy = false; pub const value_tracing = false; -pub const skip_non_native = false; pub const debug_gpa = false; pub const dev = .core; pub const io_mode: enum { threaded, evented } = .threaded; -- 2.54.0 From 4e9417c20195a0e901c20c0abd3257cba0a66fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Thu, 10 Sep 2026 02:14:32 +0200 Subject: [PATCH 2/2] ci: fold stage4 build into `zig build test docs` invocation supersedes https://codeberg.org/ziglang/zig/pulls/36704 --- ci/aarch64-freebsd-debug.sh | 19 +++++------- ci/aarch64-freebsd-release.sh | 25 +++++++--------- ci/aarch64-linux-debug.sh | 20 +++++-------- ci/aarch64-linux-release.sh | 26 +++++++---------- ci/aarch64-macos-debug.sh | 27 ++++++++--------- ci/aarch64-macos-release.sh | 31 +++++++++----------- ci/aarch64-netbsd-debug.sh | 19 +++++------- ci/aarch64-netbsd-release.sh | 25 +++++++--------- ci/aarch64-openbsd-debug.sh | 19 +++++------- ci/aarch64-openbsd-release.sh | 29 +++++++++--------- ci/aarch64-windows-debug.ps1 | 24 ++++++--------- ci/aarch64-windows-release.ps1 | 32 +++++++++----------- ci/loongarch64-linux-debug.sh | 20 +++++-------- ci/loongarch64-linux-release.sh | 26 +++++++---------- ci/powerpc64le-linux-debug.sh | 21 +++++-------- ci/powerpc64le-linux-release.sh | 27 +++++++---------- ci/riscv64-linux-debug.sh | 20 +++++-------- ci/riscv64-linux-release.sh | 26 +++++++---------- ci/s390x-linux-debug.sh | 20 +++++-------- ci/s390x-linux-release.sh | 26 +++++++---------- ci/x86_64-freebsd-debug.sh | 19 +++++------- ci/x86_64-freebsd-release.sh | 29 +++++++++--------- ci/x86_64-linux-debug-llvm.sh | 37 +++++++++++------------ ci/x86_64-linux-debug.sh | 37 +++++++++++------------ ci/x86_64-linux-release.sh | 52 +++++++++++++++------------------ ci/x86_64-netbsd-debug.sh | 19 +++++------- ci/x86_64-netbsd-release.sh | 29 +++++++++--------- ci/x86_64-openbsd-debug.sh | 19 +++++------- ci/x86_64-openbsd-release.sh | 29 +++++++++--------- ci/x86_64-windows-debug.ps1 | 24 ++++++--------- ci/x86_64-windows-release.ps1 | 32 +++++++++----------- 31 files changed, 345 insertions(+), 463 deletions(-) diff --git a/ci/aarch64-freebsd-debug.sh b/ci/aarch64-freebsd-debug.sh index a11481b4a74d998f03003a02c70576f516274b43..ec48a30beda8ee7dadc3cc2c5dd10f13d2db498b 100755 --- a/ci/aarch64-freebsd-debug.sh +++ b/ci/aarch64-freebsd-debug.sh @@ -39,20 +39,17 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - --search-prefix "$PREFIX" \ - --test-timeout 4m - -stage3-debug/bin/zig build \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ + --search-prefix "$PREFIX" \ + --test-timeout 4m \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/aarch64-freebsd-release.sh b/ci/aarch64-freebsd-release.sh index 205900073ec3dee440aaa75a1b5e6edebe2a412c..2455c5223da47cfcd02985853cee68f4e10e76aa 100755 --- a/ci/aarch64-freebsd-release.sh +++ b/ci/aarch64-freebsd-release.sh @@ -39,25 +39,22 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - --search-prefix "$PREFIX" \ - --test-timeout 4m - -# Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ + --search-prefix "$PREFIX" \ + --test-timeout 4m \ + -Dversion-string="$(stage3-release/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native +# Ensure that stage3 and stage4 are byte-for-byte identical. echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig diff --git a/ci/aarch64-linux-debug.sh b/ci/aarch64-linux-debug.sh index 185e4c6ce3a50b6b8c898208fe3e813298cae982..609506a3f09c48c0a77dbf205a061c11392f1a1c 100755 --- a/ci/aarch64-linux-debug.sh +++ b/ci/aarch64-linux-debug.sh @@ -39,21 +39,17 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - -Dtarget=native-native-musl \ - --search-prefix "$PREFIX" \ - --test-timeout 3m - -stage3-debug/bin/zig build \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ + --search-prefix "$PREFIX" \ + --test-timeout 3m \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/aarch64-linux-release.sh b/ci/aarch64-linux-release.sh index 40c9b428c0cc4cb612885fcd79238fb6518a61db..d2f38327a7aee3b08d986e4124a957e841b944c1 100755 --- a/ci/aarch64-linux-release.sh +++ b/ci/aarch64-linux-release.sh @@ -39,26 +39,22 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - -Dtarget=native-native-musl \ - --search-prefix "$PREFIX" \ - --test-timeout 3m - -# Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ + --search-prefix "$PREFIX" \ + --test-timeout 3m \ + -Dversion-string="$(stage3-release/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native +# Ensure that stage3 and stage4 are byte-for-byte identical. echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig diff --git a/ci/aarch64-macos-debug.sh b/ci/aarch64-macos-debug.sh index 9ea978f50989ee196865c35aa79d003b9b81d6ed..b9c8c0d466c8f1236e7af9579ff45504013dcde2 100755 --- a/ci/aarch64-macos-debug.sh +++ b/ci/aarch64-macos-debug.sh @@ -47,27 +47,24 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ + --prefix stage4-debug \ + --search-prefix "$PREFIX" \ + --test-timeout 2m \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ + -Dtarget=$TARGET \ + -Dcpu=$MCPU \ + -Duse-zig-libcxx \ + -Denable-llvm \ + -Dno-lib \ -Denable-macos-sdk \ - -Dstatic-llvm \ -Dskip-spirv \ -Dskip-wasm \ - -Dskip-linux \ -Dskip-freebsd \ -Dskip-netbsd \ -Dskip-openbsd \ -Dskip-windows \ - --search-prefix "$PREFIX" \ - --test-timeout 2m - -stage3-debug/bin/zig build \ - --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ - -Dtarget=$TARGET \ - -Dcpu=$MCPU \ - -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Dskip-linux stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/aarch64-macos-release.sh b/ci/aarch64-macos-release.sh index 99ebf2ddec8e106e99ff1a75a5683693d59caa4e..0b5a6bc8dc5935960fc5f1dfd3bc3b8c10c29208 100755 --- a/ci/aarch64-macos-release.sh +++ b/ci/aarch64-macos-release.sh @@ -47,36 +47,33 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ + --prefix stage4-release \ + --search-prefix "$PREFIX" \ + --test-timeout 2m \ + -Dversion-string="$(stage3-release/bin/zig version)" \ + -Dtarget=$TARGET \ + -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ + -Duse-zig-libcxx \ + -Denable-llvm \ + -Dno-lib \ -Denable-macos-sdk \ - -Dstatic-llvm \ -Dskip-spirv \ -Dskip-wasm \ - -Dskip-linux \ -Dskip-freebsd \ -Dskip-netbsd \ -Dskip-openbsd \ -Dskip-windows \ - --search-prefix "$PREFIX" \ - --test-timeout 2m + -Dskip-linux # Ensure that the fuzzer at least compiles. stage3-release/bin/zig build test-std --fuzz=1K -Dno-lib -Dfuzz-only -Doptimize=ReleaseSafe stage3-release/bin/zig build test-std --fuzz=1K -Dno-lib -Dfuzz-only -Doptimize=Debug # Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ - --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ - -Dtarget=$TARGET \ - -Dcpu=$MCPU \ - -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" - echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig diff --git a/ci/aarch64-netbsd-debug.sh b/ci/aarch64-netbsd-debug.sh index 1791da2caa55e49c02faf72169835834fb3b1c89..2c50c92ce802e429b9fed8d3330705e01b3652f4 100755 --- a/ci/aarch64-netbsd-debug.sh +++ b/ci/aarch64-netbsd-debug.sh @@ -39,20 +39,17 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - --search-prefix "$PREFIX" \ - --test-timeout 4m - -stage3-debug/bin/zig build \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ + --search-prefix "$PREFIX" \ + --test-timeout 4m \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/aarch64-netbsd-release.sh b/ci/aarch64-netbsd-release.sh index f0dc9d639d5a66c454c3af65ca3d743c774bf8bc..baabf30e56a68cbe509d7245b8900f0be73b30b6 100755 --- a/ci/aarch64-netbsd-release.sh +++ b/ci/aarch64-netbsd-release.sh @@ -39,25 +39,22 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - --search-prefix "$PREFIX" \ - --test-timeout 4m - -# Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ + --search-prefix "$PREFIX" \ + --test-timeout 4m \ + -Dversion-string="$(stage3-release/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native +# Ensure that stage3 and stage4 are byte-for-byte identical. echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig diff --git a/ci/aarch64-openbsd-debug.sh b/ci/aarch64-openbsd-debug.sh index ccb691a1f1385cafe025440f6e9b6b60d3e475c9..06a36e3cb124ce4bc414c0aabd316bd72bda6282 100755 --- a/ci/aarch64-openbsd-debug.sh +++ b/ci/aarch64-openbsd-debug.sh @@ -39,20 +39,17 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - --search-prefix "$PREFIX" \ - --test-timeout 2m - -stage3-debug/bin/zig build \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ + --search-prefix "$PREFIX" \ + --test-timeout 2m \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/aarch64-openbsd-release.sh b/ci/aarch64-openbsd-release.sh index fc48ea7ec563a8ce10797c8a07cfc28fa6df674a..ffec228495bee484df5526d48cb5d95777af75b8 100755 --- a/ci/aarch64-openbsd-release.sh +++ b/ci/aarch64-openbsd-release.sh @@ -39,12 +39,20 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ + --prefix stage4-release \ --search-prefix "$PREFIX" \ - --test-timeout 2m + --test-timeout 2m \ + -Dversion-string="$(stage3-release/bin/zig version)" \ + -Dtarget=$TARGET \ + -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ + -Duse-zig-libcxx \ + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native # Ensure that the fuzzer at least compiles. # https://codeberg.org/ziglang/zig/issues/30728 @@ -52,17 +60,6 @@ stage3-release/bin/zig build test docs \ #stage3-release/bin/zig build test-std --fuzz=1K -Dno-lib -Dfuzz-only -Doptimize=Debug # Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ - --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ - -Dtarget=$TARGET \ - -Dcpu=$MCPU \ - -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" - echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig diff --git a/ci/aarch64-windows-debug.ps1 b/ci/aarch64-windows-debug.ps1 index c5232c8d06ecfa139bfeadce1f2a8c6b30c56381..c070020e3135bbf3ea46d3aedaf9f32f924632c7 100644 --- a/ci/aarch64-windows-debug.ps1 +++ b/ci/aarch64-windows-debug.ps1 @@ -47,25 +47,19 @@ CheckLastExitCode $Env:ZIG_LIB_DIR="$(Get-Location)\..\lib" Write-Output "Main test suite..." -stage3-debug\bin\zig.exe build test docs ` - --maxrss $ZSF_MAX_RSS ` - --search-prefix "$PREFIX_PATH" ` - -Dstatic-llvm ` - -Dskip-non-native ` - -Denable-symlinks-windows ` - --test-timeout 30m -CheckLastExitCode - -Write-Output "Build and test stage4..." -stage3-debug\bin\zig.exe build ` +stage3-debug\bin\zig.exe build install test docs ` + --maxrss "$ZSF_MAX_RSS" ` --prefix stage4-debug ` - -Denable-llvm ` - -Dno-lib ` - -Doptimize=Debug ` + --search-prefix "$PREFIX_PATH" ` + --test-timeout 30m ` + -Dversion-string="$(stage3-debug\bin\zig.exe version)" ` -Dtarget="$TARGET" ` -Dcpu="$MCPU" ` -Duse-zig-libcxx ` - -Dversion-string="$(stage3-debug\bin\zig.exe version)" + -Denable-llvm ` + -Dno-lib ` + -Denable-symlinks-windows ` + -Dskip-non-native CheckLastExitCode stage4-debug\bin\zig.exe test ..\test\behavior.zig diff --git a/ci/aarch64-windows-release.ps1 b/ci/aarch64-windows-release.ps1 index 26b95dfc2e60a518431dd9c214594623a1efd3b4..82db11a754ff57d45461487eac676fa01c946bf4 100644 --- a/ci/aarch64-windows-release.ps1 +++ b/ci/aarch64-windows-release.ps1 @@ -47,13 +47,21 @@ CheckLastExitCode $Env:ZIG_LIB_DIR="$(Get-Location)\..\lib" Write-Output "Main test suite..." -stage3-release\bin\zig.exe build test docs ` - --maxrss $ZSF_MAX_RSS ` +stage3-release\bin\zig.exe build install test docs ` + --maxrss "$ZSF_MAX_RSS" ` + --prefix stage4-release ` --search-prefix "$PREFIX_PATH" ` - -Dstatic-llvm ` - -Dskip-non-native ` + --test-timeout 30m ` + -Dversion-string="$(stage3-release\bin\zig.exe version)" ` + -Dtarget="$TARGET" ` + -Dcpu="$MCPU" ` + -Doptimize=ReleaseFast ` + -Dstrip ` + -Duse-zig-libcxx ` + -Denable-llvm ` + -Dno-lib ` -Denable-symlinks-windows ` - --test-timeout 30m + -Dskip-non-native CheckLastExitCode # Ensure that the fuzzer at least compiles. @@ -64,20 +72,6 @@ CheckLastExitCode # CheckLastExitCode # Ensure that stage3 and stage4 are byte-for-byte identical. -Write-Output "Build and compare stage4..." -stage3-release\bin\zig.exe build ` - --prefix stage4-release ` - -Denable-llvm ` - -Dno-lib ` - -Doptimize=ReleaseFast ` - -Dstrip ` - -Dtarget="$TARGET" ` - -Dcpu="$MCPU" ` - -Duse-zig-libcxx ` - -Dversion-string="$(stage3-release\bin\zig.exe version)" -CheckLastExitCode - -# Compare-Object returns an error code if the files differ. Write-Output "If the following command fails, it means nondeterminism has been" Write-Output "introduced, making stage3 and stage4 no longer byte-for-byte identical." Compare-Object (Get-Content stage3-release\bin\zig.exe) (Get-Content stage4-release\bin\zig.exe) diff --git a/ci/loongarch64-linux-debug.sh b/ci/loongarch64-linux-debug.sh index 1975fb7993679910e0b5f16e5064c8c3466546dc..37895d9390c67d3262c2ba39c85672b34a2c5fd2 100755 --- a/ci/loongarch64-linux-debug.sh +++ b/ci/loongarch64-linux-debug.sh @@ -39,21 +39,17 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - -Dtarget=native-native-musl \ - --search-prefix "$PREFIX" \ - --test-timeout 4m - -stage3-debug/bin/zig build \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ + --search-prefix "$PREFIX" \ + --test-timeout 4m \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/loongarch64-linux-release.sh b/ci/loongarch64-linux-release.sh index 8f983b6d3a2add3a8faca73691a1327813175eb0..ea48fcdd772e5d5b16477427a5dc3ff7b6782b8c 100755 --- a/ci/loongarch64-linux-release.sh +++ b/ci/loongarch64-linux-release.sh @@ -39,26 +39,22 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - -Dtarget=native-native-musl \ - --search-prefix "$PREFIX" \ - --test-timeout 4m - -# Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ + --search-prefix "$PREFIX" \ + --test-timeout 4m \ + -Dversion-string="$(stage3-release/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native +# Ensure that stage3 and stage4 are byte-for-byte identical. echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig diff --git a/ci/powerpc64le-linux-debug.sh b/ci/powerpc64le-linux-debug.sh index ff7143c296c0dd8c722570ccd19aa0c387a96083..299fc4d6a6f90178c68144a808957469e7877589 100755 --- a/ci/powerpc64le-linux-debug.sh +++ b/ci/powerpc64le-linux-debug.sh @@ -39,22 +39,17 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - -Dtarget=native-native-musl \ - -Dcpu=native+longcall \ - --search-prefix "$PREFIX" \ - --test-timeout 4m - -stage3-debug/bin/zig build \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ + --search-prefix "$PREFIX" \ + --test-timeout 4m \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/powerpc64le-linux-release.sh b/ci/powerpc64le-linux-release.sh index 527265cc67a6aad1aefc2a3a7828e9c00e7577a5..9c74b1176c1ea085c14f12b6c86bcb59db7ff989 100755 --- a/ci/powerpc64le-linux-release.sh +++ b/ci/powerpc64le-linux-release.sh @@ -39,27 +39,22 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - -Dtarget=native-native-musl \ - -Dcpu=native+longcall \ - --search-prefix "$PREFIX" \ - --test-timeout 4m - -# Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ + --search-prefix "$PREFIX" \ + --test-timeout 4m \ + -Dversion-string="$(stage3-release/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native +# Ensure that stage3 and stage4 are byte-for-byte identical. echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig diff --git a/ci/riscv64-linux-debug.sh b/ci/riscv64-linux-debug.sh index 20ce6c572bd0a3e3d42369f3f6d999e06dded3ff..c9ea9928f7244f4625374e84290c72dfa15e1af5 100755 --- a/ci/riscv64-linux-debug.sh +++ b/ci/riscv64-linux-debug.sh @@ -39,21 +39,17 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - -Dtarget=native-native-musl \ - --search-prefix "$PREFIX" \ - --test-timeout 4m - -stage3-debug/bin/zig build \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ + --search-prefix "$PREFIX" \ + --test-timeout 4m \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/riscv64-linux-release.sh b/ci/riscv64-linux-release.sh index b1096e935b674c0eaffb4ebfd461094439a2cd45..d0519e094e93c200b722ee1de698373cfe387714 100755 --- a/ci/riscv64-linux-release.sh +++ b/ci/riscv64-linux-release.sh @@ -39,26 +39,22 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - -Dtarget=native-native-musl \ - --search-prefix "$PREFIX" \ - --test-timeout 4m - -# Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ + --search-prefix "$PREFIX" \ + --test-timeout 4m \ + -Dversion-string="$(stage3-release/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native +# Ensure that stage3 and stage4 are byte-for-byte identical. echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig diff --git a/ci/s390x-linux-debug.sh b/ci/s390x-linux-debug.sh index 872ae25d161d021e1d5b3f275c7d70f17bfd1eb0..2cb5fb3f7b046562844a1b28e2a1d66ba6dc63d5 100755 --- a/ci/s390x-linux-debug.sh +++ b/ci/s390x-linux-debug.sh @@ -39,21 +39,17 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - -Dtarget=native-native-musl \ - --search-prefix "$PREFIX" \ - --test-timeout 4m - -stage3-debug/bin/zig build \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ + --search-prefix "$PREFIX" \ + --test-timeout 4m \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/s390x-linux-release.sh b/ci/s390x-linux-release.sh index 7f025780506a5a0c5978ecc80133e574ad481ccd..417e9cb6af5534bb53fb02737db91e2e4a332001 100755 --- a/ci/s390x-linux-release.sh +++ b/ci/s390x-linux-release.sh @@ -39,26 +39,22 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - -Dtarget=native-native-musl \ - --search-prefix "$PREFIX" \ - --test-timeout 4m - -# Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ + --search-prefix "$PREFIX" \ + --test-timeout 4m \ + -Dversion-string="$(stage3-release/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native +# Ensure that stage3 and stage4 are byte-for-byte identical. echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig diff --git a/ci/x86_64-freebsd-debug.sh b/ci/x86_64-freebsd-debug.sh index ccb9a946c764589e46232610d9658d9b4e64aa00..8fbf5cf220c9a676ee24ed2d89640fb2aa76db8a 100755 --- a/ci/x86_64-freebsd-debug.sh +++ b/ci/x86_64-freebsd-debug.sh @@ -39,20 +39,17 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - --search-prefix "$PREFIX" \ - --test-timeout 2m - -stage3-debug/bin/zig build \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ + --search-prefix "$PREFIX" \ + --test-timeout 2m \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/x86_64-freebsd-release.sh b/ci/x86_64-freebsd-release.sh index ad6e2ab18583c5f134fcde5c02ee8c2c705ac31a..61b546dc2de224756e9895802906ec8f3c4e88c4 100755 --- a/ci/x86_64-freebsd-release.sh +++ b/ci/x86_64-freebsd-release.sh @@ -39,29 +39,26 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ + --prefix stage4-release \ --search-prefix "$PREFIX" \ - --test-timeout 2m + --test-timeout 2m \ + -Dversion-string="$(stage3-release/bin/zig version)" \ + -Dtarget=$TARGET \ + -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ + -Duse-zig-libcxx \ + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native # Ensure that the fuzzer at least compiles. stage3-release/bin/zig build test-std --fuzz=1K -Dno-lib -Dfuzz-only -Doptimize=ReleaseSafe stage3-release/bin/zig build test-std --fuzz=1K -Dno-lib -Dfuzz-only -Doptimize=Debug # Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ - --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ - -Dtarget=$TARGET \ - -Dcpu=$MCPU \ - -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" - echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig diff --git a/ci/x86_64-linux-debug-llvm.sh b/ci/x86_64-linux-debug-llvm.sh index 86709f28b79615d5e752922191d30a7541732455..43772d930d80390e6b9676bec7f300ddc829f2ce 100755 --- a/ci/x86_64-linux-debug-llvm.sh +++ b/ci/x86_64-linux-debug-llvm.sh @@ -40,37 +40,34 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -# simultaneously test building self-hosted without LLVM and with 32-bit arm +# Simultaneously test building self-hosted without LLVM and with 32-bit arm stage3-debug/bin/zig build \ + --maxrss "${ZSF_MAX_RSS:-0}" \ -Dtarget=arm-linux-musleabihf \ -Dno-lib -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dlldb=$HOME/deps/lldb-zig/Debug-aad646607a/bin/lldb \ - -Dlibc-test-path=$HOME/deps/libc-test-b95fe84 \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ + --prefix stage4-debug \ + --search-prefix "$PREFIX" \ + --libc-runtimes "$HOME/deps/glibc-2.43-musl-1.2.5" \ + --test-timeout 12m \ -fqemu \ - --libc-runtimes $HOME/deps/glibc-2.43-musl-1.2.5 \ -fwasmtime \ - -Dstatic-llvm \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ + -Dtarget=$TARGET \ + -Dcpu=$MCPU \ + -Duse-llvm \ + -Duse-zig-libcxx \ + -Denable-llvm \ + -Dno-lib \ -Dskip-freebsd \ -Dskip-netbsd \ -Dskip-openbsd \ -Dskip-windows \ -Dskip-darwin \ - -Dtarget=native-native-musl \ - --search-prefix "$PREFIX" \ -Denable-superhtml \ - --test-timeout 12m - -stage3-debug/bin/zig build \ - --prefix stage4-debug \ - -Duse-llvm \ - -Denable-llvm \ - -Dno-lib \ - -Dtarget=$TARGET \ - -Dcpu=$MCPU \ - -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Dlldb="$HOME/deps/lldb-zig/Debug-aad646607a/bin/lldb" \ + -Dlibc-test-path="$HOME/deps/libc-test-b95fe84" stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/x86_64-linux-debug.sh b/ci/x86_64-linux-debug.sh index 3cdb7d7586693ffc18a4aaa4f6eb79961ccdc303..935c117663109fc1d7ab0a5c979dcf553f270bfe 100755 --- a/ci/x86_64-linux-debug.sh +++ b/ci/x86_64-linux-debug.sh @@ -40,36 +40,33 @@ ninja install export ZIG_LIB_DIR="$PWD/../lib" export ZIG_DEBUG_CMD=1 -# simultaneously test building self-hosted without LLVM and with 32-bit arm +# Simultaneously test building self-hosted without LLVM and with 32-bit arm stage3-debug/bin/zig build \ + --maxrss "${ZSF_MAX_RSS:-0}" \ -Dtarget=arm-linux-musleabihf \ -Dno-lib -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dlldb=$HOME/deps/lldb-zig/Debug-aad646607a/bin/lldb \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ + --prefix stage4-debug \ + --search-prefix "$PREFIX" \ + --libc-runtimes "$HOME/deps/glibc-2.43-musl-1.2.5" \ + --test-timeout 10m \ -fqemu \ - --libc-runtimes $HOME/deps/glibc-2.43-musl-1.2.5 \ -fwasmtime \ - -Dstatic-llvm \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ + -Dtarget=$TARGET \ + -Dcpu=$MCPU \ + -Duse-zig-libcxx \ + -Denable-llvm \ + -Dno-lib \ + -Denable-superhtml \ + -Dlldb="$HOME/deps/lldb-zig/Debug-aad646607a/bin/lldb" \ -Dskip-freebsd \ -Dskip-netbsd \ -Dskip-openbsd \ -Dskip-windows \ -Dskip-darwin \ - -Dskip-llvm \ - -Dtarget=native-native-musl \ - --search-prefix "$PREFIX" \ - -Denable-superhtml \ - --test-timeout 10m - -stage3-debug/bin/zig build \ - --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ - -Dtarget=$TARGET \ - -Dcpu=$MCPU \ - -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Dskip-llvm stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/x86_64-linux-release.sh b/ci/x86_64-linux-release.sh index ceb7ab6f2f0311c9ffbb342c11072d9748cc40fa..64fb0c81ae191e910b67153ebe8a38b62501abeb 100755 --- a/ci/x86_64-linux-release.sh +++ b/ci/x86_64-linux-release.sh @@ -45,43 +45,36 @@ ninja install # Must not be set while using the other `zig cc` which has its own zig lib dir. export ZIG_LIB_DIR="$PWD/../lib" -# Covers several things: -# 1. building the compiler without LLVM -# 2. 32-bit -# 3. arm +# Simultaneously test building self-hosted without LLVM and with 32-bit arm stage3-release/bin/zig build \ -Dtarget=arm-linux-musleabihf \ -Dno-lib -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dlldb=$HOME/deps/lldb-zig/Release-aad646607a/bin/lldb \ - -Dlibc-test-path=$HOME/deps/libc-test-b95fe84 \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ + --prefix stage4-release \ + --search-prefix "$PREFIX" \ + --libc-runtimes "$HOME/deps/glibc-2.43-musl-1.2.5" \ + --test-timeout 12m \ -fqemu \ - --libc-runtimes $HOME/deps/glibc-2.43-musl-1.2.5 \ -fwasmtime \ - -Dstatic-llvm \ - -Dtarget=native-native-musl \ - --search-prefix "$PREFIX" \ + -Dversion-string="$(stage3-release/bin/zig version)" \ + -Dtarget=$TARGET \ + -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ + -Duse-zig-libcxx \ + -Denable-llvm \ + -Dno-lib \ -Denable-superhtml \ - --test-timeout 12m + -Dlldb="$HOME/deps/lldb-zig/Release-aad646607a/bin/lldb" \ + -Dlibc-test-path="$HOME/deps/libc-test-b95fe84" # Ensure that the fuzzer at least compiles. stage3-release/bin/zig build test-std --fuzz=1K -Dno-lib -Dfuzz-only -Doptimize=ReleaseSafe stage3-release/bin/zig build test-std --fuzz=1K -Dno-lib -Dfuzz-only -Doptimize=Debug # Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ - --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ - -Dtarget=$TARGET \ - -Dcpu=$MCPU \ - -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" - echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig @@ -110,9 +103,12 @@ ninja install export ZIG_LIB_DIR="$PWD/../lib" stage3/bin/zig test ../test/behavior.zig -stage3/bin/zig build -p stage4 \ +stage3/bin/zig build \ + --maxrss "${ZSF_MAX_RSS:-0}" \ + --prefix stage4 \ + --search-prefix "$PREFIX" \ + -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Dstatic-llvm \ - -Dtarget=native-native-musl \ - -Dno-lib \ - --search-prefix "$PREFIX" + -Dno-lib stage4/bin/zig test ../test/behavior.zig diff --git a/ci/x86_64-netbsd-debug.sh b/ci/x86_64-netbsd-debug.sh index 1de7b01c6684a0505dbda291dde918235681d89d..a08da72f7645a94a63836998366d68d5c9825ad3 100755 --- a/ci/x86_64-netbsd-debug.sh +++ b/ci/x86_64-netbsd-debug.sh @@ -39,20 +39,17 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - --search-prefix "$PREFIX" \ - --test-timeout 2m - -stage3-debug/bin/zig build \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ + --search-prefix "$PREFIX" \ + --test-timeout 2m \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/x86_64-netbsd-release.sh b/ci/x86_64-netbsd-release.sh index c3792943daec12e37b4cd5d4e9c040c919745f13..c147a88de391d8ebb76cd26b698c15623e42c6e9 100755 --- a/ci/x86_64-netbsd-release.sh +++ b/ci/x86_64-netbsd-release.sh @@ -39,29 +39,26 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ + --prefix stage4-release \ --search-prefix "$PREFIX" \ - --test-timeout 2m + --test-timeout 2m \ + -Dversion-string="$(stage3-release/bin/zig version)" \ + -Dtarget=$TARGET \ + -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ + -Duse-zig-libcxx \ + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native # Ensure that the fuzzer at least compiles. stage3-release/bin/zig build test-std --fuzz=1K -Dno-lib -Dfuzz-only -Doptimize=ReleaseSafe stage3-release/bin/zig build test-std --fuzz=1K -Dno-lib -Dfuzz-only -Doptimize=Debug # Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ - --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ - -Dtarget=$TARGET \ - -Dcpu=$MCPU \ - -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" - echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig diff --git a/ci/x86_64-openbsd-debug.sh b/ci/x86_64-openbsd-debug.sh index e28bf3a24fb95043b7124e933895bb0976c1a9c5..87d036a2345483f12a1cf3ac8b1873324f8238a5 100755 --- a/ci/x86_64-openbsd-debug.sh +++ b/ci/x86_64-openbsd-debug.sh @@ -39,20 +39,17 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-debug/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ - --search-prefix "$PREFIX" \ - --test-timeout 2m - -stage3-debug/bin/zig build \ +stage3-debug/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ --prefix stage4-debug \ - -Denable-llvm \ - -Dno-lib \ + --search-prefix "$PREFIX" \ + --test-timeout 2m \ + -Dversion-string="$(stage3-debug/bin/zig version)" \ -Dtarget=$TARGET \ -Dcpu=$MCPU \ -Duse-zig-libcxx \ - -Dversion-string="$(stage3-debug/bin/zig version)" + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native \ stage4-debug/bin/zig test ../test/behavior.zig diff --git a/ci/x86_64-openbsd-release.sh b/ci/x86_64-openbsd-release.sh index f5c62306120925ddd26bc3fa367bcd1246369d4b..69c71086684f61df4d45dde8d7251e58d534a4bb 100755 --- a/ci/x86_64-openbsd-release.sh +++ b/ci/x86_64-openbsd-release.sh @@ -39,12 +39,20 @@ ninja install # Must be done after zig cc is finished. export ZIG_LIB_DIR="$PWD/../lib" -stage3-release/bin/zig build test docs \ - --maxrss ${ZSF_MAX_RSS:-0} \ - -Dstatic-llvm \ - -Dskip-non-native \ +stage3-release/bin/zig build install test docs \ + --maxrss "${ZSF_MAX_RSS:-0}" \ + --prefix stage4-release \ --search-prefix "$PREFIX" \ - --test-timeout 2m + --test-timeout 2m \ + -Dversion-string="$(stage3-release/bin/zig version)" \ + -Dtarget=$TARGET \ + -Dcpu=$MCPU \ + -Doptimize=ReleaseFast \ + -Dstrip \ + -Duse-zig-libcxx \ + -Denable-llvm \ + -Dno-lib \ + -Dskip-non-native # Ensure that the fuzzer at least compiles. # https://codeberg.org/ziglang/zig/issues/30728 @@ -52,17 +60,6 @@ stage3-release/bin/zig build test docs \ #stage3-release/bin/zig build test-std --fuzz=1K -Dno-lib -Dfuzz-only -Doptimize=Debug # Ensure that stage3 and stage4 are byte-for-byte identical. -stage3-release/bin/zig build \ - --prefix stage4-release \ - -Denable-llvm \ - -Dno-lib \ - -Doptimize=ReleaseFast \ - -Dstrip \ - -Dtarget=$TARGET \ - -Dcpu=$MCPU \ - -Duse-zig-libcxx \ - -Dversion-string="$(stage3-release/bin/zig version)" - echo "If the following command fails, it means nondeterminism has been" echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." diff stage3-release/bin/zig stage4-release/bin/zig diff --git a/ci/x86_64-windows-debug.ps1 b/ci/x86_64-windows-debug.ps1 index 5914c3c9e4d6efe6fccfe0cbba58b808206c0d74..6124c9777a323d1d531f2f09c1c23fb46ddf7d7a 100644 --- a/ci/x86_64-windows-debug.ps1 +++ b/ci/x86_64-windows-debug.ps1 @@ -47,25 +47,19 @@ CheckLastExitCode $Env:ZIG_LIB_DIR="$(Get-Location)\..\lib" Write-Output "Main test suite..." -stage3-debug\bin\zig.exe build test docs ` - --maxrss $ZSF_MAX_RSS ` - --search-prefix "$PREFIX_PATH" ` - -Dstatic-llvm ` - -Dskip-non-native ` - -Denable-symlinks-windows ` - --test-timeout 30m -CheckLastExitCode - -Write-Output "Build and test stage4..." -stage3-debug\bin\zig.exe build ` +stage3-debug\bin\zig.exe build install test docs ` + --maxrss "$ZSF_MAX_RSS" ` --prefix stage4-debug ` - -Denable-llvm ` - -Dno-lib ` - -Doptimize=Debug ` + --search-prefix "$PREFIX_PATH" ` + --test-timeout 30m ` + -Dversion-string="$(stage3-debug\bin\zig.exe version)" ` -Dtarget="$TARGET" ` -Dcpu="$MCPU" ` -Duse-zig-libcxx ` - -Dversion-string="$(stage3-debug\bin\zig.exe version)" + -Denable-llvm ` + -Dno-lib ` + -Denable-symlinks-windows ` + -Dskip-non-native CheckLastExitCode stage4-debug\bin\zig.exe test ..\test\behavior.zig diff --git a/ci/x86_64-windows-release.ps1 b/ci/x86_64-windows-release.ps1 index 07ac431c499c1becce5b10869d9abfb58c763b85..87d2e369dd816eae431e236be1a3cb9b10e08630 100644 --- a/ci/x86_64-windows-release.ps1 +++ b/ci/x86_64-windows-release.ps1 @@ -47,13 +47,21 @@ CheckLastExitCode $Env:ZIG_LIB_DIR="$(Get-Location)\..\lib" Write-Output "Main test suite..." -stage3-release\bin\zig.exe build test docs ` - --maxrss $ZSF_MAX_RSS ` +stage3-release\bin\zig.exe build install test docs ` + --maxrss "$ZSF_MAX_RSS" ` + --prefix stage4-release ` --search-prefix "$PREFIX_PATH" ` - -Dstatic-llvm ` - -Dskip-non-native ` + --test-timeout 30m ` + -Dversion-string="$(stage3-release\bin\zig.exe version)" ` + -Dtarget="$TARGET" ` + -Dcpu="$MCPU" ` + -Doptimize=ReleaseFast ` + -Dstrip ` + -Duse-zig-libcxx ` + -Denable-llvm ` + -Dno-lib ` -Denable-symlinks-windows ` - --test-timeout 30m + -Dskip-non-native CheckLastExitCode # Ensure that the fuzzer at least compiles. @@ -64,20 +72,6 @@ CheckLastExitCode # CheckLastExitCode # Ensure that stage3 and stage4 are byte-for-byte identical. -Write-Output "Build and compare stage4..." -stage3-release\bin\zig.exe build ` - --prefix stage4-release ` - -Denable-llvm ` - -Dno-lib ` - -Doptimize=ReleaseFast ` - -Dstrip ` - -Dtarget="$TARGET" ` - -Dcpu="$MCPU" ` - -Duse-zig-libcxx ` - -Dversion-string="$(stage3-release\bin\zig.exe version)" -CheckLastExitCode - -# Compare-Object returns an error code if the files differ. Write-Output "If the following command fails, it means nondeterminism has been" Write-Output "introduced, making stage3 and stage4 no longer byte-for-byte identical." Compare-Object (Get-Content stage3-release\bin\zig.exe) (Get-Content stage4-release\bin\zig.exe) -- 2.54.0