| author |  Andrew Kelley <andrew@ziglang.org> 2024-10-17 19:50:42-07:00 |
| committer |  GitHub <noreply@github.com> 2024-10-17 19:50:42-07:00 |
| log | fffbb511db5de611ca670fc13a223ddbe255c92c |
| tree | aebcdefc0d0aae362ac38bc3eddc0e53401d4d08 |
| parent | ff594eae49104c009ddfc13a6f7d82e1ec1a68f4 |
| parent | 8bfc36f0912810c51a41567f93abde6ef14f076d |
| signature |  Signed by PGP key B5690EEEBB952194 |
Merge pull request #21736 from alexrp/qemu-9.1
ci: Update to QEMU 9.1.0 in x86_64-linux scripts4 files changed, 6 insertions(+), 8 deletions(-)
ci/aarch64-linux-debug.sh+2-3
| ... | @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" | ... | @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" |
| 12 | PREFIX="$HOME/deps/$CACHE_BASENAME" | 12 | PREFIX="$HOME/deps/$CACHE_BASENAME" |
| 13 | ZIG="$PREFIX/bin/zig" | 13 | ZIG="$PREFIX/bin/zig" |
| 14 | 14 | ||
| 15 | export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/local/bin:$PATH" | 15 | export PATH="$HOME/local/bin:$PATH" |
| 16 | 16 | ||
| 17 | # Make the `zig version` number consistent. | 17 | # Make the `zig version` number consistent. |
| 18 | # This will affect the cmake command below. | 18 | # This will affect the cmake command below. |
| ... | @@ -54,10 +54,9 @@ stage3-debug/bin/zig build \ | ... | @@ -54,10 +54,9 @@ stage3-debug/bin/zig build \ |
| 54 | -Dtarget=arm-linux-musleabihf \ | 54 | -Dtarget=arm-linux-musleabihf \ |
| 55 | -Dno-lib | 55 | -Dno-lib |
| 56 | 56 | ||
| 57 | # TODO: add -fqemu back to this line | 57 | # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts. |
| 58 | stage3-debug/bin/zig build test docs \ | 58 | stage3-debug/bin/zig build test docs \ |
| 59 | --maxrss 24696061952 \ | 59 | --maxrss 24696061952 \ |
| 60 | -fwasmtime \ | ||
| 61 | -Dstatic-llvm \ | 60 | -Dstatic-llvm \ |
| 62 | -Dtarget=native-native-musl \ | 61 | -Dtarget=native-native-musl \ |
| 63 | --search-prefix "$PREFIX" \ | 62 | --search-prefix "$PREFIX" \ |
ci/aarch64-linux-release.sh+2-3
| ... | @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" | ... | @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" |
| 12 | PREFIX="$HOME/deps/$CACHE_BASENAME" | 12 | PREFIX="$HOME/deps/$CACHE_BASENAME" |
| 13 | ZIG="$PREFIX/bin/zig" | 13 | ZIG="$PREFIX/bin/zig" |
| 14 | 14 | ||
| 15 | export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/local/bin:$PATH" | 15 | export PATH="$HOME/local/bin:$PATH" |
| 16 | 16 | ||
| 17 | # Make the `zig version` number consistent. | 17 | # Make the `zig version` number consistent. |
| 18 | # This will affect the cmake command below. | 18 | # This will affect the cmake command below. |
| ... | @@ -54,10 +54,9 @@ stage3-release/bin/zig build \ | ... | @@ -54,10 +54,9 @@ stage3-release/bin/zig build \ |
| 54 | -Dtarget=arm-linux-musleabihf \ | 54 | -Dtarget=arm-linux-musleabihf \ |
| 55 | -Dno-lib | 55 | -Dno-lib |
| 56 | 56 | ||
| 57 | # TODO: add -fqemu back to this line | 57 | # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts. |
| 58 | stage3-release/bin/zig build test docs \ | 58 | stage3-release/bin/zig build test docs \ |
| 59 | --maxrss 24696061952 \ | 59 | --maxrss 24696061952 \ |
| 60 | -fwasmtime \ | ||
| 61 | -Dstatic-llvm \ | 60 | -Dstatic-llvm \ |
| 62 | -Dtarget=native-native-musl \ | 61 | -Dtarget=native-native-musl \ |
| 63 | --search-prefix "$PREFIX" \ | 62 | --search-prefix "$PREFIX" \ |
ci/x86_64-linux-debug.sh+1-1
| ... | @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" | ... | @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" |
| 12 | PREFIX="$HOME/deps/$CACHE_BASENAME" | 12 | PREFIX="$HOME/deps/$CACHE_BASENAME" |
| 13 | ZIG="$PREFIX/bin/zig" | 13 | ZIG="$PREFIX/bin/zig" |
| 14 | 14 | ||
| 15 | export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-8.2.1/bin:$HOME/local/bin:$PATH" | 15 | export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-9.1.0/bin:$HOME/local/bin:$PATH" |
| 16 | 16 | ||
| 17 | # Make the `zig version` number consistent. | 17 | # Make the `zig version` number consistent. |
| 18 | # This will affect the cmake command below. | 18 | # This will affect the cmake command below. |
ci/x86_64-linux-release.sh+1-1
| ... | @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" | ... | @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" |
| 12 | PREFIX="$HOME/deps/$CACHE_BASENAME" | 12 | PREFIX="$HOME/deps/$CACHE_BASENAME" |
| 13 | ZIG="$PREFIX/bin/zig" | 13 | ZIG="$PREFIX/bin/zig" |
| 14 | 14 | ||
| 15 | export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-8.2.1/bin:$HOME/local/bin:$PATH" | 15 | export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-9.1.0/bin:$HOME/local/bin:$PATH" |
| 16 | 16 | ||
| 17 | # Make the `zig version` number consistent. | 17 | # Make the `zig version` number consistent. |
| 18 | # This will affect the cmake command below. | 18 | # This will affect the cmake command below. |