| author |  Alex Rønne Petersen <alex@alexrp.com> 2025-03-31 17:51:25+02:00 |
| committer | Alex Rønne Petersen <alex@alexrp.com> 2025-03-31 17:52:34+02:00 |
| log | b8d78661939aac548cbac28873836b697eb0e4f3 |
| tree | ca0cad2f27132c5c63c273affc323afc930514ed |
| parent | 4c0913ff7c1e6839f2a39f9932482664db5bc21d |
| signature |  Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM |
Merge pull request #23371 from alexrp/ci-redundancy
Remove some `aarch64-linux` CI steps that are already covered by `x86_64-linux`2 files changed, 8 insertions(+), 72 deletions(-)
ci/aarch64-linux-debug.sh+8-35100644→100755
| ... | @@ -48,11 +48,6 @@ unset CXX | ... | @@ -48,11 +48,6 @@ unset CXX |
| 48 | 48 | ||
| 49 | ninja install | 49 | ninja install |
| 50 | 50 | ||
| 51 | # simultaneously test building self-hosted without LLVM and with 32-bit arm | ||
| 52 | stage3-debug/bin/zig build \ | ||
| 53 | -Dtarget=arm-linux-musleabihf \ | ||
| 54 | -Dno-lib | ||
| 55 | |||
| 56 | # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts. | 51 | # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts. |
| 57 | stage3-debug/bin/zig build test docs \ | 52 | stage3-debug/bin/zig build test docs \ |
| 58 | --maxrss 24696061952 \ | 53 | --maxrss 24696061952 \ |
| ... | @@ -62,34 +57,12 @@ stage3-debug/bin/zig build test docs \ | ... | @@ -62,34 +57,12 @@ stage3-debug/bin/zig build test docs \ |
| 62 | --zig-lib-dir "$PWD/../lib" \ | 57 | --zig-lib-dir "$PWD/../lib" \ |
| 63 | -Denable-superhtml | 58 | -Denable-superhtml |
| 64 | 59 | ||
| 65 | # Ensure that updating the wasm binary from this commit will result in a viable build. | 60 | stage3-debug/bin/zig build \ |
| 66 | stage3-debug/bin/zig build update-zig1 | 61 | --prefix stage4-debug \ |
| 67 | 62 | -Denable-llvm \ | |
| 68 | mkdir ../build-new | ||
| 69 | cd ../build-new | ||
| 70 | |||
| 71 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 72 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 73 | |||
| 74 | cmake .. \ | ||
| 75 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | ||
| 76 | -DCMAKE_BUILD_TYPE=Debug \ | ||
| 77 | -DZIG_TARGET_TRIPLE="$TARGET" \ | ||
| 78 | -DZIG_TARGET_MCPU="$MCPU" \ | ||
| 79 | -DZIG_STATIC=ON \ | ||
| 80 | -DZIG_NO_LIB=ON \ | ||
| 81 | -GNinja | ||
| 82 | |||
| 83 | unset CC | ||
| 84 | unset CXX | ||
| 85 | |||
| 86 | ninja install | ||
| 87 | |||
| 88 | stage3/bin/zig test ../test/behavior.zig | ||
| 89 | stage3/bin/zig build -p stage4 \ | ||
| 90 | -Dstatic-llvm \ | ||
| 91 | -Dtarget=native-native-musl \ | ||
| 92 | -Dno-lib \ | 63 | -Dno-lib \ |
| 93 | --search-prefix "$PREFIX" \ | 64 | -Dtarget=$TARGET \ |
| 94 | --zig-lib-dir "$PWD/../lib" | 65 | -Duse-zig-libcxx \ |
| 95 | stage4/bin/zig test ../test/behavior.zig | 66 | -Dversion-string="$(stage3-debug/bin/zig version)" |
| 67 | |||
| 68 | stage4-debug/bin/zig test ../test/behavior.zig |
ci/aarch64-linux-release.sh-37100644→100755
| ... | @@ -48,11 +48,6 @@ unset CXX | ... | @@ -48,11 +48,6 @@ unset CXX |
| 48 | 48 | ||
| 49 | ninja install | 49 | ninja install |
| 50 | 50 | ||
| 51 | # simultaneously test building self-hosted without LLVM and with 32-bit arm | ||
| 52 | stage3-release/bin/zig build \ | ||
| 53 | -Dtarget=arm-linux-musleabihf \ | ||
| 54 | -Dno-lib | ||
| 55 | |||
| 56 | # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts. | 51 | # No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts. |
| 57 | stage3-release/bin/zig build test docs \ | 52 | stage3-release/bin/zig build test docs \ |
| 58 | --maxrss 24696061952 \ | 53 | --maxrss 24696061952 \ |
| ... | @@ -77,35 +72,3 @@ stage3-release/bin/zig build \ | ... | @@ -77,35 +72,3 @@ stage3-release/bin/zig build \ |
| 77 | echo "If the following command fails, it means nondeterminism has been" | 72 | echo "If the following command fails, it means nondeterminism has been" |
| 78 | echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." | 73 | echo "introduced, making stage3 and stage4 no longer byte-for-byte identical." |
| 79 | diff stage3-release/bin/zig stage4-release/bin/zig | 74 | diff stage3-release/bin/zig stage4-release/bin/zig |
| 80 | |||
| 81 | # Ensure that updating the wasm binary from this commit will result in a viable build. | ||
| 82 | stage3-release/bin/zig build update-zig1 | ||
| 83 | |||
| 84 | mkdir ../build-new | ||
| 85 | cd ../build-new | ||
| 86 | |||
| 87 | export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" | ||
| 88 | export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ||
| 89 | |||
| 90 | cmake .. \ | ||
| 91 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | ||
| 92 | -DCMAKE_BUILD_TYPE=Release \ | ||
| 93 | -DZIG_TARGET_TRIPLE="$TARGET" \ | ||
| 94 | -DZIG_TARGET_MCPU="$MCPU" \ | ||
| 95 | -DZIG_STATIC=ON \ | ||
| 96 | -DZIG_NO_LIB=ON \ | ||
| 97 | -GNinja | ||
| 98 | |||
| 99 | unset CC | ||
| 100 | unset CXX | ||
| 101 | |||
| 102 | ninja install | ||
| 103 | |||
| 104 | stage3/bin/zig test ../test/behavior.zig | ||
| 105 | stage3/bin/zig build -p stage4 \ | ||
| 106 | -Dstatic-llvm \ | ||
| 107 | -Dtarget=native-native-musl \ | ||
| 108 | -Dno-lib \ | ||
| 109 | --search-prefix "$PREFIX" \ | ||
| 110 | --zig-lib-dir "$PWD/../lib" | ||
| 111 | stage4/bin/zig test ../test/behavior.zig |