From 6028adda4bc456d95dada6d1b9b91756ae6b5377 Mon Sep 17 00:00:00 2001 From: Loris Cro Date: Tue, 29 Nov 2022 22:03:30 +0100 Subject: [PATCH] ci: add markers for collapsing log sections in GH web UI --- ci/linux/build-aarch64.sh | 6 ++++++ ci/linux/build-x86_64-debug.sh | 6 ++++++ ci/linux/build-x86_64-release.sh | 8 ++++++++ ci/macos/build-aarch64.sh | 5 +++++ ci/windows/build.ps1 | 12 ++++++------ 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/ci/linux/build-aarch64.sh b/ci/linux/build-aarch64.sh index 2f57e06f05..9474dba81c 100644 --- a/ci/linux/build-aarch64.sh +++ b/ci/linux/build-aarch64.sh @@ -26,6 +26,7 @@ export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" rm -rf build-release mkdir build-release cd build-release +echo "::group:: Build Zig" cmake .. \ -DCMAKE_INSTALL_PREFIX="stage3-release" \ -DCMAKE_PREFIX_PATH="$PREFIX" \ @@ -41,6 +42,7 @@ unset CC unset CXX ninja install +echo "::endgroup::" echo "Looking for non-conforming code formatting..." stage3-release/bin/zig fmt --check .. \ @@ -48,16 +50,20 @@ stage3-release/bin/zig fmt --check .. \ --exclude ../build-release # simultaneously test building self-hosted without LLVM and with 32-bit arm +echo "::group:: zig build arm32" stage3-release/bin/zig build -Dtarget=arm-linux-musleabihf +echo "::endgroup::" # TODO: add -fqemu back to this line +echo "::group:: zig build test docs" stage3-release/bin/zig build test docs \ -fwasmtime \ -Dstatic-llvm \ -Dtarget=native-native-musl \ --search-prefix "$PREFIX" \ --zig-lib-dir "$(pwd)/../lib" +echo "::endgroup::" # Look for HTML errors. tidy --drop-empty-elements no -qe ../zig-cache/langref.html diff --git a/ci/linux/build-x86_64-debug.sh b/ci/linux/build-x86_64-debug.sh index 68bb3e42d0..90d6499cae 100755 --- a/ci/linux/build-x86_64-debug.sh +++ b/ci/linux/build-x86_64-debug.sh @@ -26,6 +26,7 @@ export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" rm -rf build-debug mkdir build-debug cd build-debug +echo "::group:: Build Zig" cmake .. \ -DCMAKE_INSTALL_PREFIX="stage3-debug" \ -DCMAKE_PREFIX_PATH="$PREFIX" \ @@ -41,6 +42,7 @@ unset CC unset CXX ninja install +echo "::endgroup::" echo "Looking for non-conforming code formatting..." stage3-debug/bin/zig fmt --check .. \ @@ -49,10 +51,13 @@ stage3-debug/bin/zig fmt --check .. \ --exclude ../build-release # simultaneously test building self-hosted without LLVM and with 32-bit arm +echo "::group:: zig build arm32" stage3-debug/bin/zig build -Dtarget=arm-linux-musleabihf +echo "::endgroup::" # building docs disabled due to: # https://github.com/ziglang/zig/issues/13546 +echo "::group:: zig build test" stage3-debug/bin/zig build test \ -fqemu \ -fwasmtime \ @@ -60,6 +65,7 @@ stage3-debug/bin/zig build test \ -Dtarget=native-native-musl \ --search-prefix "$PREFIX" \ --zig-lib-dir "$(pwd)/../lib" +echo "::endgroup::" # langref disabled due to: # https://github.com/ziglang/zig/issues/13546 diff --git a/ci/linux/build-x86_64-release.sh b/ci/linux/build-x86_64-release.sh index fbcf86e418..d559a98cdd 100755 --- a/ci/linux/build-x86_64-release.sh +++ b/ci/linux/build-x86_64-release.sh @@ -26,6 +26,7 @@ export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" rm -rf build-release mkdir build-release cd build-release +echo "::group:: Build Zig" cmake .. \ -DCMAKE_INSTALL_PREFIX="stage3-release" \ -DCMAKE_PREFIX_PATH="$PREFIX" \ @@ -41,6 +42,7 @@ unset CC unset CXX ninja install +echo "::endgroup::" echo "Looking for non-conforming code formatting..." stage3-release/bin/zig fmt --check .. \ @@ -49,8 +51,11 @@ stage3-release/bin/zig fmt --check .. \ --exclude ../build-release # simultaneously test building self-hosted without LLVM and with 32-bit arm +echo "::group:: zig build arm32" stage3-release/bin/zig build -Dtarget=arm-linux-musleabihf +echo "::endgroup::" +echo "::group:: zig build test docs" stage3-release/bin/zig build test docs \ -fqemu \ -fwasmtime \ @@ -58,6 +63,7 @@ stage3-release/bin/zig build test docs \ -Dtarget=native-native-musl \ --search-prefix "$PREFIX" \ --zig-lib-dir "$(pwd)/../lib" +echo "::endgroup::" # Look for HTML errors. tidy --drop-empty-elements no -qe ../zig-cache/langref.html @@ -65,6 +71,7 @@ tidy --drop-empty-elements no -qe ../zig-cache/langref.html # Produce the experimental std lib documentation. stage3-release/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib +echo "::group:: zig build stage4" stage3-release/bin/zig build \ --prefix stage4-release \ -Denable-llvm \ @@ -75,6 +82,7 @@ stage3-release/bin/zig build \ -Dtarget=$TARGET \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-release/bin/zig version)" +echo "::endgroup::" # diff returns an error code if the files differ. echo "If the following command fails, it means nondeterminism has been" diff --git a/ci/macos/build-aarch64.sh b/ci/macos/build-aarch64.sh index 52f3aad696..2227fce017 100755 --- a/ci/macos/build-aarch64.sh +++ b/ci/macos/build-aarch64.sh @@ -23,6 +23,7 @@ git fetch --tags mkdir build cd build +echo "::group:: Build Zig" PATH="$HOME/local/bin:$PATH" cmake .. \ -DCMAKE_INSTALL_PREFIX="stage3-release" \ -DCMAKE_PREFIX_PATH="$PREFIX" \ @@ -35,13 +36,17 @@ PATH="$HOME/local/bin:$PATH" cmake .. \ -GNinja $HOME/local/bin/ninja install +echo "::endgroup::" + +echo "::group:: zig build test docs" stage3-release/bin/zig build test docs \ --zig-lib-dir "$(pwd)/../lib" \ -Denable-macos-sdk \ -Dstatic-llvm \ -Dskip-non-native \ --search-prefix "$PREFIX" +echo "::endgroup::" # Produce the experimental std lib documentation. stage3-release/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib diff --git a/ci/windows/build.ps1 b/ci/windows/build.ps1 index 2e49402750..249467f924 100644 --- a/ci/windows/build.ps1 +++ b/ci/windows/build.ps1 @@ -31,8 +31,7 @@ if ((git rev-parse --is-shallow-repository) -eq "true") { git fetch --unshallow # `git describe` won't work on a shallow repo } -Write-Output "Building Zig..." - +Write-Output "::group:: Building Zig..." & "$ZIGPREFIXPATH\bin\zig.exe" build ` --prefix "$ZIGINSTALLDIR" ` --search-prefix "$ZIGPREFIXPATH" ` @@ -43,21 +42,22 @@ Write-Output "Building Zig..." -Duse-zig-libcxx ` -Dtarget="$TARGET" CheckLastExitCode +Write-Output "::endgroup::" -Write-Output " zig build test docs..." - +Write-Output "::group:: zig build test docs..." & "$ZIGINSTALLDIR\bin\zig.exe" build test docs ` --search-prefix "$ZIGPREFIXPATH" ` -Dstatic-llvm ` -Dskip-non-native ` -Denable-symlinks-windows CheckLastExitCode +Write-Output "::endgroup::" # Produce the experimental std lib documentation. -Write-Output "zig test std/std.zig..." - +Write-Output "::group:: zig test std/std.zig..." & "$ZIGINSTALLDIR\bin\zig.exe" test "$ZIGLIBDIR\std\std.zig" ` --zig-lib-dir "$ZIGLIBDIR" ` -femit-docs ` -fno-emit-bin CheckLastExitCode +Write-Output "::endgroup::" \ No newline at end of file