mirror of
https://codeberg.org/ziglang/zig.git
synced 2025-12-06 05:44:20 +00:00
Merge pull request #23371 from alexrp/ci-redundancy
Remove some `aarch64-linux` CI steps that are already covered by `x86_64-linux`
This commit is contained in:
parent
4c0913ff7c
commit
b8d7866193
2 changed files with 8 additions and 72 deletions
43
ci/aarch64-linux-debug.sh
Normal file → Executable file
43
ci/aarch64-linux-debug.sh
Normal file → Executable file
|
|
@ -48,11 +48,6 @@ unset CXX
|
||||||
|
|
||||||
ninja install
|
ninja install
|
||||||
|
|
||||||
# simultaneously test building self-hosted without LLVM and with 32-bit arm
|
|
||||||
stage3-debug/bin/zig build \
|
|
||||||
-Dtarget=arm-linux-musleabihf \
|
|
||||||
-Dno-lib
|
|
||||||
|
|
||||||
# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
|
# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
|
||||||
stage3-debug/bin/zig build test docs \
|
stage3-debug/bin/zig build test docs \
|
||||||
--maxrss 24696061952 \
|
--maxrss 24696061952 \
|
||||||
|
|
@ -62,34 +57,12 @@ stage3-debug/bin/zig build test docs \
|
||||||
--zig-lib-dir "$PWD/../lib" \
|
--zig-lib-dir "$PWD/../lib" \
|
||||||
-Denable-superhtml
|
-Denable-superhtml
|
||||||
|
|
||||||
# Ensure that updating the wasm binary from this commit will result in a viable build.
|
stage3-debug/bin/zig build \
|
||||||
stage3-debug/bin/zig build update-zig1
|
--prefix stage4-debug \
|
||||||
|
-Denable-llvm \
|
||||||
mkdir ../build-new
|
|
||||||
cd ../build-new
|
|
||||||
|
|
||||||
export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
|
|
||||||
export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
|
|
||||||
|
|
||||||
cmake .. \
|
|
||||||
-DCMAKE_PREFIX_PATH="$PREFIX" \
|
|
||||||
-DCMAKE_BUILD_TYPE=Debug \
|
|
||||||
-DZIG_TARGET_TRIPLE="$TARGET" \
|
|
||||||
-DZIG_TARGET_MCPU="$MCPU" \
|
|
||||||
-DZIG_STATIC=ON \
|
|
||||||
-DZIG_NO_LIB=ON \
|
|
||||||
-GNinja
|
|
||||||
|
|
||||||
unset CC
|
|
||||||
unset CXX
|
|
||||||
|
|
||||||
ninja install
|
|
||||||
|
|
||||||
stage3/bin/zig test ../test/behavior.zig
|
|
||||||
stage3/bin/zig build -p stage4 \
|
|
||||||
-Dstatic-llvm \
|
|
||||||
-Dtarget=native-native-musl \
|
|
||||||
-Dno-lib \
|
-Dno-lib \
|
||||||
--search-prefix "$PREFIX" \
|
-Dtarget=$TARGET \
|
||||||
--zig-lib-dir "$PWD/../lib"
|
-Duse-zig-libcxx \
|
||||||
stage4/bin/zig test ../test/behavior.zig
|
-Dversion-string="$(stage3-debug/bin/zig version)"
|
||||||
|
|
||||||
|
stage4-debug/bin/zig test ../test/behavior.zig
|
||||||
|
|
|
||||||
37
ci/aarch64-linux-release.sh
Normal file → Executable file
37
ci/aarch64-linux-release.sh
Normal file → Executable file
|
|
@ -48,11 +48,6 @@ unset CXX
|
||||||
|
|
||||||
ninja install
|
ninja install
|
||||||
|
|
||||||
# simultaneously test building self-hosted without LLVM and with 32-bit arm
|
|
||||||
stage3-release/bin/zig build \
|
|
||||||
-Dtarget=arm-linux-musleabihf \
|
|
||||||
-Dno-lib
|
|
||||||
|
|
||||||
# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
|
# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
|
||||||
stage3-release/bin/zig build test docs \
|
stage3-release/bin/zig build test docs \
|
||||||
--maxrss 24696061952 \
|
--maxrss 24696061952 \
|
||||||
|
|
@ -77,35 +72,3 @@ stage3-release/bin/zig build \
|
||||||
echo "If the following command fails, it means nondeterminism has been"
|
echo "If the following command fails, it means nondeterminism has been"
|
||||||
echo "introduced, making stage3 and stage4 no longer byte-for-byte identical."
|
echo "introduced, making stage3 and stage4 no longer byte-for-byte identical."
|
||||||
diff stage3-release/bin/zig stage4-release/bin/zig
|
diff stage3-release/bin/zig stage4-release/bin/zig
|
||||||
|
|
||||||
# Ensure that updating the wasm binary from this commit will result in a viable build.
|
|
||||||
stage3-release/bin/zig build update-zig1
|
|
||||||
|
|
||||||
mkdir ../build-new
|
|
||||||
cd ../build-new
|
|
||||||
|
|
||||||
export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
|
|
||||||
export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
|
|
||||||
|
|
||||||
cmake .. \
|
|
||||||
-DCMAKE_PREFIX_PATH="$PREFIX" \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DZIG_TARGET_TRIPLE="$TARGET" \
|
|
||||||
-DZIG_TARGET_MCPU="$MCPU" \
|
|
||||||
-DZIG_STATIC=ON \
|
|
||||||
-DZIG_NO_LIB=ON \
|
|
||||||
-GNinja
|
|
||||||
|
|
||||||
unset CC
|
|
||||||
unset CXX
|
|
||||||
|
|
||||||
ninja install
|
|
||||||
|
|
||||||
stage3/bin/zig test ../test/behavior.zig
|
|
||||||
stage3/bin/zig build -p stage4 \
|
|
||||||
-Dstatic-llvm \
|
|
||||||
-Dtarget=native-native-musl \
|
|
||||||
-Dno-lib \
|
|
||||||
--search-prefix "$PREFIX" \
|
|
||||||
--zig-lib-dir "$PWD/../lib"
|
|
||||||
stage4/bin/zig test ../test/behavior.zig
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue