authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-03-31 17:51:25+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-03-31 17:51:25+02:00
log0753af792a41645b6cac51d7bd29b2c526c3b81b
tree2c5770cb22420382856a1ef5f7cc978f4c8689ca
parentc118cd6406dee6852ae427ff02ebbf053c44ef9a
parent09783b8544fe69e7a52ed7bee4e74cd510a217be
signaturebadge-check Signed by PGP key B5690EEEBB952194

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
4848
4949ninja install
5050
51# simultaneously test building self-hosted without LLVM and with 32-bit arm
52stage3-debug/bin/zig build \
53 -Dtarget=arm-linux-musleabihf \
54 -Dno-lib
55
5651# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
5752stage3-debug/bin/zig build test docs \
5853 --maxrss 24696061952 \
......@@ -62,34 +57,12 @@ stage3-debug/bin/zig build test docs \
6257 --zig-lib-dir "$PWD/../lib" \
6358 -Denable-superhtml
6459
65# Ensure that updating the wasm binary from this commit will result in a viable build.
66stage3-debug/bin/zig build update-zig1
67
68mkdir ../build-new
69cd ../build-new
70
71export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
72export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
73
74cmake .. \
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
83unset CC
84unset CXX
85
86ninja install
87
88stage3/bin/zig test ../test/behavior.zig
89stage3/bin/zig build -p stage4 \
90 -Dstatic-llvm \
91 -Dtarget=native-native-musl \
60stage3-debug/bin/zig build \
61 --prefix stage4-debug \
62 -Denable-llvm \
9263 -Dno-lib \
93 --search-prefix "$PREFIX" \
94 --zig-lib-dir "$PWD/../lib"
95stage4/bin/zig test ../test/behavior.zig
64 -Dtarget=$TARGET \
65 -Duse-zig-libcxx \
66 -Dversion-string="$(stage3-debug/bin/zig version)"
67
68stage4-debug/bin/zig test ../test/behavior.zig
ci/aarch64-linux-release.sh-37100644→100755
......@@ -48,11 +48,6 @@ unset CXX
4848
4949ninja install
5050
51# simultaneously test building self-hosted without LLVM and with 32-bit arm
52stage3-release/bin/zig build \
53 -Dtarget=arm-linux-musleabihf \
54 -Dno-lib
55
5651# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
5752stage3-release/bin/zig build test docs \
5853 --maxrss 24696061952 \
......@@ -77,35 +72,3 @@ stage3-release/bin/zig build \
7772echo "If the following command fails, it means nondeterminism has been"
7873echo "introduced, making stage3 and stage4 no longer byte-for-byte identical."
7974diff 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.
82stage3-release/bin/zig build update-zig1
83
84mkdir ../build-new
85cd ../build-new
86
87export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
88export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
89
90cmake .. \
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
99unset CC
100unset CXX
101
102ninja install
103
104stage3/bin/zig test ../test/behavior.zig
105stage3/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"
111stage4/bin/zig test ../test/behavior.zig