authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-12-03 21:29:51+01:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-12-04 20:06:48+01:00
log78cba869289c66be875a72850437f95fe7541e92
tree917cddf87bda1def7117adfd10197dc419c882c2
parent2728eb5d5ed0a7cdf33140b31ffa364eaffd7afd
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

ci: set maxrss from $ZSF_MAX_RSS if provided by the runner

All of our runners now define this. When running a CI script locally, this will not be set, so we default to 0, aka "all available system memory".

18 files changed, 21 insertions(+), 15 deletions(-)

ci/aarch64-linux-debug.sh+1-1
......@@ -44,7 +44,7 @@ ninja install
4444
4545# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
4646stage3-debug/bin/zig build test docs \
47 --maxrss 44918199637 \
47 --maxrss ${ZSF_MAX_RSS:-0} \
4848 -Dstatic-llvm \
4949 -Dskip-non-native \
5050 -Dtarget=native-native-musl \
ci/aarch64-linux-release.sh+1-1
......@@ -44,7 +44,7 @@ ninja install
4444
4545# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
4646stage3-release/bin/zig build test docs \
47 --maxrss 44918199637 \
47 --maxrss ${ZSF_MAX_RSS:-0} \
4848 -Dstatic-llvm \
4949 -Dskip-non-native \
5050 -Dtarget=native-native-musl \
ci/aarch64-macos-debug.sh+1
......@@ -42,6 +42,7 @@ cmake .. \
4242ninja install
4343
4444stage3-debug/bin/zig build test docs \
45 --maxrss ${ZSF_MAX_RSS:-0} \
4546 --zig-lib-dir "$PWD/../lib" \
4647 -Denable-macos-sdk \
4748 -Dstatic-llvm \
ci/aarch64-macos-release.sh+1
......@@ -51,6 +51,7 @@ stage3-release/bin/zig build test docs \
5151
5252# Ensure that stage3 and stage4 are byte-for-byte identical.
5353stage3-release/bin/zig build \
54 --maxrss ${ZSF_MAX_RSS:-0} \
5455 --prefix stage4-release \
5556 -Denable-llvm \
5657 -Dno-lib \
ci/aarch64-windows.ps1+2
......@@ -5,6 +5,7 @@ $ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip
55$PREFIX_PATH = "$(Get-Location)\..\$ZIG_LLVM_CLANG_LLD_NAME"
66$ZIG = "$PREFIX_PATH\bin\zig.exe"
77$ZIG_LIB_DIR = "$(Get-Location)\lib"
8$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }
89
910if (!(Test-Path "..\$ZIG_LLVM_CLANG_LLD_NAME.zip")) {
1011 Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL"
......@@ -54,6 +55,7 @@ CheckLastExitCode
5455
5556Write-Output "Main test suite..."
5657& "stage3-release\bin\zig.exe" build test docs `
58 --maxrss $ZSF_MAX_RSS `
5759 --zig-lib-dir "$ZIG_LIB_DIR" `
5860 --search-prefix "$PREFIX_PATH" `
5961 -Dstatic-llvm `
ci/loongarch64-linux-debug.sh+1-1
......@@ -45,7 +45,7 @@ ninja install
4545
4646# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
4747stage3-debug/bin/zig build test docs \
48 --maxrss 60129542144 \
48 --maxrss ${ZSF_MAX_RSS:-0} \
4949 -Dstatic-llvm \
5050 -Dskip-non-native \
5151 -Dtarget=native-native-musl \
ci/loongarch64-linux-release.sh+1-1
......@@ -45,7 +45,7 @@ ninja install
4545
4646# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
4747stage3-release/bin/zig build test docs \
48 --maxrss 60129542144 \
48 --maxrss ${ZSF_MAX_RSS:-0} \
4949 -Dstatic-llvm \
5050 -Dskip-non-native \
5151 -Dtarget=native-native-musl \
ci/riscv64-linux-debug.sh+1-1
......@@ -44,7 +44,7 @@ ninja install
4444
4545# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
4646stage3-debug/bin/zig build test-cases test-modules test-unit test-c-abi test-stack-traces test-error-traces test-llvm-ir \
47 --maxrss 68719476736 \
47 --maxrss ${ZSF_MAX_RSS:-0} \
4848 -Dstatic-llvm \
4949 -Dskip-non-native \
5050 -Dskip-single-threaded \
ci/riscv64-linux-release.sh+1-1
......@@ -44,7 +44,7 @@ ninja install
4444
4545# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
4646stage3-release/bin/zig build test-cases test-modules test-unit test-c-abi test-stack-traces test-error-traces test-llvm-ir \
47 --maxrss 68719476736 \
47 --maxrss ${ZSF_MAX_RSS:-0} \
4848 -Dstatic-llvm \
4949 -Dskip-non-native \
5050 -Dskip-single-threaded \
ci/s390x-linux-debug.sh+1-1
......@@ -45,7 +45,7 @@ ninja install
4545
4646# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
4747stage3-debug/bin/zig build test docs \
48 --maxrss 30064771072 \
48 --maxrss ${ZSF_MAX_RSS:-0} \
4949 -Dstatic-llvm \
5050 -Dskip-non-native \
5151 -Dtarget=native-native-musl \
ci/s390x-linux-release.sh+1-1
......@@ -45,7 +45,7 @@ ninja install
4545
4646# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
4747stage3-release/bin/zig build test docs \
48 --maxrss 30064771072 \
48 --maxrss ${ZSF_MAX_RSS:-0} \
4949 -Dstatic-llvm \
5050 -Dskip-non-native \
5151 -Dtarget=native-native-musl \
ci/x86_64-freebsd-debug.sh+1-1
......@@ -44,7 +44,7 @@ unset CXX
4444ninja install
4545
4646stage3-debug/bin/zig build test docs \
47 --maxrss 42949672960 \
47 --maxrss ${ZSF_MAX_RSS:-0} \
4848 -Dstatic-llvm \
4949 -Dskip-spirv \
5050 -Dskip-wasm \
ci/x86_64-freebsd-release.sh+1-1
......@@ -44,7 +44,7 @@ unset CXX
4444ninja install
4545
4646stage3-release/bin/zig build test docs \
47 --maxrss 42949672960 \
47 --maxrss ${ZSF_MAX_RSS:-0} \
4848 -Dstatic-llvm \
4949 -Dskip-spirv \
5050 -Dskip-wasm \
ci/x86_64-linux-debug-llvm.sh+1-1
......@@ -49,7 +49,7 @@ stage3-debug/bin/zig build \
4949 -Dno-lib
5050
5151stage3-debug/bin/zig build test docs \
52 --maxrss 21000000000 \
52 --maxrss ${ZSF_MAX_RSS:-0} \
5353 -Dlldb=$HOME/deps/lldb-zig/Debug-e0a42bb34/bin/lldb \
5454 -fqemu \
5555 -fwasmtime \
ci/x86_64-linux-debug.sh+1-1
......@@ -48,7 +48,7 @@ stage3-debug/bin/zig build \
4848 -Dno-lib
4949
5050stage3-debug/bin/zig build test docs \
51 --maxrss 21000000000 \
51 --maxrss ${ZSF_MAX_RSS:-0} \
5252 -Dlldb=$HOME/deps/lldb-zig/Debug-e0a42bb34/bin/lldb \
5353 -fqemu \
5454 -fwasmtime \
ci/x86_64-linux-release.sh+1-1
......@@ -54,7 +54,7 @@ stage3-release/bin/zig build \
5454 -Dno-lib
5555
5656stage3-release/bin/zig build test docs \
57 --maxrss 21000000000 \
57 --maxrss ${ZSF_MAX_RSS:-0} \
5858 -Dlldb=$HOME/deps/lldb-zig/Release-e0a42bb34/bin/lldb \
5959 -fqemu \
6060 -fwasmtime \
ci/x86_64-windows-debug.ps1+2-1
......@@ -5,6 +5,7 @@ $ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip
55$PREFIX_PATH = "$($Env:USERPROFILE)\$ZIG_LLVM_CLANG_LLD_NAME"
66$ZIG = "$PREFIX_PATH\bin\zig.exe"
77$ZIG_LIB_DIR = "$(Get-Location)\lib"
8$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }
89
910if (!(Test-Path "$PREFIX_PATH.zip")) {
1011 Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL"
......@@ -54,7 +55,7 @@ CheckLastExitCode
5455
5556Write-Output "Main test suite..."
5657& "stage3-debug\bin\zig.exe" build test docs `
57 --maxrss 32212254720 `
58 --maxrss $ZSF_MAX_RSS `
5859 --zig-lib-dir "$ZIG_LIB_DIR" `
5960 --search-prefix "$PREFIX_PATH" `
6061 -Dstatic-llvm `
ci/x86_64-windows-release.ps1+2-1
......@@ -5,6 +5,7 @@ $ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip
55$PREFIX_PATH = "$($Env:USERPROFILE)\$ZIG_LLVM_CLANG_LLD_NAME"
66$ZIG = "$PREFIX_PATH\bin\zig.exe"
77$ZIG_LIB_DIR = "$(Get-Location)\lib"
8$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }
89
910if (!(Test-Path "$PREFIX_PATH.zip")) {
1011 Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL"
......@@ -54,7 +55,7 @@ CheckLastExitCode
5455
5556Write-Output "Main test suite..."
5657& "stage3-release\bin\zig.exe" build test docs `
57 --maxrss 32212254720 `
58 --maxrss $ZSF_MAX_RSS `
5859 --zig-lib-dir "$ZIG_LIB_DIR" `
5960 --search-prefix "$PREFIX_PATH" `
6061 -Dstatic-llvm `