diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-10-17 19:50:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-17 19:50:42 -0700 |
| commit | fffbb511db5de611ca670fc13a223ddbe255c92c (patch) | |
| tree | aebcdefc0d0aae362ac38bc3eddc0e53401d4d08 | |
| parent | ff594eae49104c009ddfc13a6f7d82e1ec1a68f4 (diff) | |
| parent | 8bfc36f0912810c51a41567f93abde6ef14f076d (diff) | |
| download | zig-fffbb511db5de611ca670fc13a223ddbe255c92c.tar.gz zig-fffbb511db5de611ca670fc13a223ddbe255c92c.zip | |
Merge pull request #21736 from alexrp/qemu-9.1
ci: Update to QEMU 9.1.0 in x86_64-linux scripts
| -rw-r--r-- | ci/aarch64-linux-debug.sh | 5 | ||||
| -rw-r--r-- | ci/aarch64-linux-release.sh | 5 | ||||
| -rwxr-xr-x | ci/x86_64-linux-debug.sh | 2 | ||||
| -rwxr-xr-x | ci/x86_64-linux-release.sh | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/ci/aarch64-linux-debug.sh b/ci/aarch64-linux-debug.sh index f1ffebcc63..47f75c4624 100644 --- a/ci/aarch64-linux-debug.sh +++ b/ci/aarch64-linux-debug.sh @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" -export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/local/bin:$PATH" +export PATH="$HOME/local/bin:$PATH" # Make the `zig version` number consistent. # This will affect the cmake command below. @@ -54,10 +54,9 @@ stage3-debug/bin/zig build \ -Dtarget=arm-linux-musleabihf \ -Dno-lib -# TODO: add -fqemu back to this line +# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts. stage3-debug/bin/zig build test docs \ --maxrss 24696061952 \ - -fwasmtime \ -Dstatic-llvm \ -Dtarget=native-native-musl \ --search-prefix "$PREFIX" \ diff --git a/ci/aarch64-linux-release.sh b/ci/aarch64-linux-release.sh index 7ae5a3ceb4..a41255b454 100644 --- a/ci/aarch64-linux-release.sh +++ b/ci/aarch64-linux-release.sh @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" -export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/local/bin:$PATH" +export PATH="$HOME/local/bin:$PATH" # Make the `zig version` number consistent. # This will affect the cmake command below. @@ -54,10 +54,9 @@ stage3-release/bin/zig build \ -Dtarget=arm-linux-musleabihf \ -Dno-lib -# TODO: add -fqemu back to this line +# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts. stage3-release/bin/zig build test docs \ --maxrss 24696061952 \ - -fwasmtime \ -Dstatic-llvm \ -Dtarget=native-native-musl \ --search-prefix "$PREFIX" \ diff --git a/ci/x86_64-linux-debug.sh b/ci/x86_64-linux-debug.sh index 62f8bd2d94..7204fa29f1 100755 --- a/ci/x86_64-linux-debug.sh +++ b/ci/x86_64-linux-debug.sh @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" -export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-8.2.1/bin:$HOME/local/bin:$PATH" +export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-9.1.0/bin:$HOME/local/bin:$PATH" # Make the `zig version` number consistent. # This will affect the cmake command below. diff --git a/ci/x86_64-linux-release.sh b/ci/x86_64-linux-release.sh index 6f388748ba..b51b6f12d6 100755 --- a/ci/x86_64-linux-release.sh +++ b/ci/x86_64-linux-release.sh @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" -export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-8.2.1/bin:$HOME/local/bin:$PATH" +export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-9.1.0/bin:$HOME/local/bin:$PATH" # Make the `zig version` number consistent. # This will affect the cmake command below. |