| author | |
| committer | |
| log | 52e1be9c68aba87c1c530461c794b9c87c8a2016 |
| tree | 14917ddc2b9fa3de0c92a8e3ac31d87eb09d2a90 |
| parent | 6028adda4bc456d95dada6d1b9b91756ae6b5377 |
This reverts commit 6028adda4bc456d95dada6d1b9b91756ae6b5377.5 files changed, 6 insertions(+), 31 deletions(-)
ci/linux/build-aarch64.sh-6| ... | @@ -26,7 +26,6 @@ export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ... | @@ -26,7 +26,6 @@ export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" |
| 26 | rm -rf build-release | 26 | rm -rf build-release |
| 27 | mkdir build-release | 27 | mkdir build-release |
| 28 | cd build-release | 28 | cd build-release |
| 29 | echo "::group:: Build Zig" | ||
| 30 | cmake .. \ | 29 | cmake .. \ |
| 31 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 30 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 32 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 31 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| ... | @@ -42,7 +41,6 @@ unset CC | ... | @@ -42,7 +41,6 @@ unset CC |
| 42 | unset CXX | 41 | unset CXX |
| 43 | 42 | ||
| 44 | ninja install | 43 | ninja install |
| 45 | echo "::endgroup::" | ||
| 46 | 44 | ||
| 47 | echo "Looking for non-conforming code formatting..." | 45 | echo "Looking for non-conforming code formatting..." |
| 48 | stage3-release/bin/zig fmt --check .. \ | 46 | stage3-release/bin/zig fmt --check .. \ |
| ... | @@ -50,20 +48,16 @@ stage3-release/bin/zig fmt --check .. \ | ... | @@ -50,20 +48,16 @@ stage3-release/bin/zig fmt --check .. \ |
| 50 | --exclude ../build-release | 48 | --exclude ../build-release |
| 51 | 49 | ||
| 52 | # simultaneously test building self-hosted without LLVM and with 32-bit arm | 50 | # simultaneously test building self-hosted without LLVM and with 32-bit arm |
| 53 | echo "::group:: zig build arm32" | ||
| 54 | stage3-release/bin/zig build -Dtarget=arm-linux-musleabihf | 51 | stage3-release/bin/zig build -Dtarget=arm-linux-musleabihf |
| 55 | echo "::endgroup::" | ||
| 56 | 52 | ||
| 57 | # TODO: add -fqemu back to this line | 53 | # TODO: add -fqemu back to this line |
| 58 | 54 | ||
| 59 | echo "::group:: zig build test docs" | ||
| 60 | stage3-release/bin/zig build test docs \ | 55 | stage3-release/bin/zig build test docs \ |
| 61 | -fwasmtime \ | 56 | -fwasmtime \ |
| 62 | -Dstatic-llvm \ | 57 | -Dstatic-llvm \ |
| 63 | -Dtarget=native-native-musl \ | 58 | -Dtarget=native-native-musl \ |
| 64 | --search-prefix "$PREFIX" \ | 59 | --search-prefix "$PREFIX" \ |
| 65 | --zig-lib-dir "$(pwd)/../lib" | 60 | --zig-lib-dir "$(pwd)/../lib" |
| 66 | echo "::endgroup::" | ||
| 67 | 61 | ||
| 68 | # Look for HTML errors. | 62 | # Look for HTML errors. |
| 69 | tidy --drop-empty-elements no -qe ../zig-cache/langref.html | 63 | tidy --drop-empty-elements no -qe ../zig-cache/langref.html |
ci/linux/build-x86_64-debug.sh-6| ... | @@ -26,7 +26,6 @@ export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ... | @@ -26,7 +26,6 @@ export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" |
| 26 | rm -rf build-debug | 26 | rm -rf build-debug |
| 27 | mkdir build-debug | 27 | mkdir build-debug |
| 28 | cd build-debug | 28 | cd build-debug |
| 29 | echo "::group:: Build Zig" | ||
| 30 | cmake .. \ | 29 | cmake .. \ |
| 31 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ | 30 | -DCMAKE_INSTALL_PREFIX="stage3-debug" \ |
| 32 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 31 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| ... | @@ -42,7 +41,6 @@ unset CC | ... | @@ -42,7 +41,6 @@ unset CC |
| 42 | unset CXX | 41 | unset CXX |
| 43 | 42 | ||
| 44 | ninja install | 43 | ninja install |
| 45 | echo "::endgroup::" | ||
| 46 | 44 | ||
| 47 | echo "Looking for non-conforming code formatting..." | 45 | echo "Looking for non-conforming code formatting..." |
| 48 | stage3-debug/bin/zig fmt --check .. \ | 46 | stage3-debug/bin/zig fmt --check .. \ |
| ... | @@ -51,13 +49,10 @@ stage3-debug/bin/zig fmt --check .. \ | ... | @@ -51,13 +49,10 @@ stage3-debug/bin/zig fmt --check .. \ |
| 51 | --exclude ../build-release | 49 | --exclude ../build-release |
| 52 | 50 | ||
| 53 | # simultaneously test building self-hosted without LLVM and with 32-bit arm | 51 | # simultaneously test building self-hosted without LLVM and with 32-bit arm |
| 54 | echo "::group:: zig build arm32" | ||
| 55 | stage3-debug/bin/zig build -Dtarget=arm-linux-musleabihf | 52 | stage3-debug/bin/zig build -Dtarget=arm-linux-musleabihf |
| 56 | echo "::endgroup::" | ||
| 57 | 53 | ||
| 58 | # building docs disabled due to: | 54 | # building docs disabled due to: |
| 59 | # https://github.com/ziglang/zig/issues/13546 | 55 | # https://github.com/ziglang/zig/issues/13546 |
| 60 | echo "::group:: zig build test" | ||
| 61 | stage3-debug/bin/zig build test \ | 56 | stage3-debug/bin/zig build test \ |
| 62 | -fqemu \ | 57 | -fqemu \ |
| 63 | -fwasmtime \ | 58 | -fwasmtime \ |
| ... | @@ -65,7 +60,6 @@ stage3-debug/bin/zig build test \ | ... | @@ -65,7 +60,6 @@ stage3-debug/bin/zig build test \ |
| 65 | -Dtarget=native-native-musl \ | 60 | -Dtarget=native-native-musl \ |
| 66 | --search-prefix "$PREFIX" \ | 61 | --search-prefix "$PREFIX" \ |
| 67 | --zig-lib-dir "$(pwd)/../lib" | 62 | --zig-lib-dir "$(pwd)/../lib" |
| 68 | echo "::endgroup::" | ||
| 69 | 63 | ||
| 70 | # langref disabled due to: | 64 | # langref disabled due to: |
| 71 | # https://github.com/ziglang/zig/issues/13546 | 65 | # https://github.com/ziglang/zig/issues/13546 |
ci/linux/build-x86_64-release.sh-8| ... | @@ -26,7 +26,6 @@ export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" | ... | @@ -26,7 +26,6 @@ export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" |
| 26 | rm -rf build-release | 26 | rm -rf build-release |
| 27 | mkdir build-release | 27 | mkdir build-release |
| 28 | cd build-release | 28 | cd build-release |
| 29 | echo "::group:: Build Zig" | ||
| 30 | cmake .. \ | 29 | cmake .. \ |
| 31 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 30 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 32 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 31 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| ... | @@ -42,7 +41,6 @@ unset CC | ... | @@ -42,7 +41,6 @@ unset CC |
| 42 | unset CXX | 41 | unset CXX |
| 43 | 42 | ||
| 44 | ninja install | 43 | ninja install |
| 45 | echo "::endgroup::" | ||
| 46 | 44 | ||
| 47 | echo "Looking for non-conforming code formatting..." | 45 | echo "Looking for non-conforming code formatting..." |
| 48 | stage3-release/bin/zig fmt --check .. \ | 46 | stage3-release/bin/zig fmt --check .. \ |
| ... | @@ -51,11 +49,8 @@ stage3-release/bin/zig fmt --check .. \ | ... | @@ -51,11 +49,8 @@ stage3-release/bin/zig fmt --check .. \ |
| 51 | --exclude ../build-release | 49 | --exclude ../build-release |
| 52 | 50 | ||
| 53 | # simultaneously test building self-hosted without LLVM and with 32-bit arm | 51 | # simultaneously test building self-hosted without LLVM and with 32-bit arm |
| 54 | echo "::group:: zig build arm32" | ||
| 55 | stage3-release/bin/zig build -Dtarget=arm-linux-musleabihf | 52 | stage3-release/bin/zig build -Dtarget=arm-linux-musleabihf |
| 56 | echo "::endgroup::" | ||
| 57 | 53 | ||
| 58 | echo "::group:: zig build test docs" | ||
| 59 | stage3-release/bin/zig build test docs \ | 54 | stage3-release/bin/zig build test docs \ |
| 60 | -fqemu \ | 55 | -fqemu \ |
| 61 | -fwasmtime \ | 56 | -fwasmtime \ |
| ... | @@ -63,7 +58,6 @@ stage3-release/bin/zig build test docs \ | ... | @@ -63,7 +58,6 @@ stage3-release/bin/zig build test docs \ |
| 63 | -Dtarget=native-native-musl \ | 58 | -Dtarget=native-native-musl \ |
| 64 | --search-prefix "$PREFIX" \ | 59 | --search-prefix "$PREFIX" \ |
| 65 | --zig-lib-dir "$(pwd)/../lib" | 60 | --zig-lib-dir "$(pwd)/../lib" |
| 66 | echo "::endgroup::" | ||
| 67 | 61 | ||
| 68 | # Look for HTML errors. | 62 | # Look for HTML errors. |
| 69 | tidy --drop-empty-elements no -qe ../zig-cache/langref.html | 63 | tidy --drop-empty-elements no -qe ../zig-cache/langref.html |
| ... | @@ -71,7 +65,6 @@ tidy --drop-empty-elements no -qe ../zig-cache/langref.html | ... | @@ -71,7 +65,6 @@ tidy --drop-empty-elements no -qe ../zig-cache/langref.html |
| 71 | # Produce the experimental std lib documentation. | 65 | # Produce the experimental std lib documentation. |
| 72 | stage3-release/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib | 66 | stage3-release/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib |
| 73 | 67 | ||
| 74 | echo "::group:: zig build stage4" | ||
| 75 | stage3-release/bin/zig build \ | 68 | stage3-release/bin/zig build \ |
| 76 | --prefix stage4-release \ | 69 | --prefix stage4-release \ |
| 77 | -Denable-llvm \ | 70 | -Denable-llvm \ |
| ... | @@ -82,7 +75,6 @@ stage3-release/bin/zig build \ | ... | @@ -82,7 +75,6 @@ stage3-release/bin/zig build \ |
| 82 | -Dtarget=$TARGET \ | 75 | -Dtarget=$TARGET \ |
| 83 | -Duse-zig-libcxx \ | 76 | -Duse-zig-libcxx \ |
| 84 | -Dversion-string="$(stage3-release/bin/zig version)" | 77 | -Dversion-string="$(stage3-release/bin/zig version)" |
| 85 | echo "::endgroup::" | ||
| 86 | 78 | ||
| 87 | # diff returns an error code if the files differ. | 79 | # diff returns an error code if the files differ. |
| 88 | echo "If the following command fails, it means nondeterminism has been" | 80 | echo "If the following command fails, it means nondeterminism has been" |
ci/macos/build-aarch64.sh-5| ... | @@ -23,7 +23,6 @@ git fetch --tags | ... | @@ -23,7 +23,6 @@ git fetch --tags |
| 23 | 23 | ||
| 24 | mkdir build | 24 | mkdir build |
| 25 | cd build | 25 | cd build |
| 26 | echo "::group:: Build Zig" | ||
| 27 | PATH="$HOME/local/bin:$PATH" cmake .. \ | 26 | PATH="$HOME/local/bin:$PATH" cmake .. \ |
| 28 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ | 27 | -DCMAKE_INSTALL_PREFIX="stage3-release" \ |
| 29 | -DCMAKE_PREFIX_PATH="$PREFIX" \ | 28 | -DCMAKE_PREFIX_PATH="$PREFIX" \ |
| ... | @@ -36,17 +35,13 @@ PATH="$HOME/local/bin:$PATH" cmake .. \ | ... | @@ -36,17 +35,13 @@ PATH="$HOME/local/bin:$PATH" cmake .. \ |
| 36 | -GNinja | 35 | -GNinja |
| 37 | 36 | ||
| 38 | $HOME/local/bin/ninja install | 37 | $HOME/local/bin/ninja install |
| 39 | echo "::endgroup::" | ||
| 40 | 38 | ||
| 41 | |||
| 42 | echo "::group:: zig build test docs" | ||
| 43 | stage3-release/bin/zig build test docs \ | 39 | stage3-release/bin/zig build test docs \ |
| 44 | --zig-lib-dir "$(pwd)/../lib" \ | 40 | --zig-lib-dir "$(pwd)/../lib" \ |
| 45 | -Denable-macos-sdk \ | 41 | -Denable-macos-sdk \ |
| 46 | -Dstatic-llvm \ | 42 | -Dstatic-llvm \ |
| 47 | -Dskip-non-native \ | 43 | -Dskip-non-native \ |
| 48 | --search-prefix "$PREFIX" | 44 | --search-prefix "$PREFIX" |
| 49 | echo "::endgroup::" | ||
| 50 | 45 | ||
| 51 | # Produce the experimental std lib documentation. | 46 | # Produce the experimental std lib documentation. |
| 52 | stage3-release/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib | 47 | stage3-release/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib |
ci/windows/build.ps1+6-6| ... | @@ -31,7 +31,8 @@ if ((git rev-parse --is-shallow-repository) -eq "true") { | ... | @@ -31,7 +31,8 @@ if ((git rev-parse --is-shallow-repository) -eq "true") { |
| 31 | git fetch --unshallow # `git describe` won't work on a shallow repo | 31 | git fetch --unshallow # `git describe` won't work on a shallow repo |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | Write-Output "::group:: Building Zig..." | 34 | Write-Output "Building Zig..." |
| 35 | |||
| 35 | & "$ZIGPREFIXPATH\bin\zig.exe" build ` | 36 | & "$ZIGPREFIXPATH\bin\zig.exe" build ` |
| 36 | --prefix "$ZIGINSTALLDIR" ` | 37 | --prefix "$ZIGINSTALLDIR" ` |
| 37 | --search-prefix "$ZIGPREFIXPATH" ` | 38 | --search-prefix "$ZIGPREFIXPATH" ` |
| ... | @@ -42,22 +43,21 @@ Write-Output "::group:: Building Zig..." | ... | @@ -42,22 +43,21 @@ Write-Output "::group:: Building Zig..." |
| 42 | -Duse-zig-libcxx ` | 43 | -Duse-zig-libcxx ` |
| 43 | -Dtarget="$TARGET" | 44 | -Dtarget="$TARGET" |
| 44 | CheckLastExitCode | 45 | CheckLastExitCode |
| 45 | Write-Output "::endgroup::" | ||
| 46 | 46 | ||
| 47 | Write-Output "::group:: zig build test docs..." | 47 | Write-Output " zig build test docs..." |
| 48 | |||
| 48 | & "$ZIGINSTALLDIR\bin\zig.exe" build test docs ` | 49 | & "$ZIGINSTALLDIR\bin\zig.exe" build test docs ` |
| 49 | --search-prefix "$ZIGPREFIXPATH" ` | 50 | --search-prefix "$ZIGPREFIXPATH" ` |
| 50 | -Dstatic-llvm ` | 51 | -Dstatic-llvm ` |
| 51 | -Dskip-non-native ` | 52 | -Dskip-non-native ` |
| 52 | -Denable-symlinks-windows | 53 | -Denable-symlinks-windows |
| 53 | CheckLastExitCode | 54 | CheckLastExitCode |
| 54 | Write-Output "::endgroup::" | ||
| 55 | 55 | ||
| 56 | # Produce the experimental std lib documentation. | 56 | # Produce the experimental std lib documentation. |
| 57 | Write-Output "::group:: zig test std/std.zig..." | 57 | Write-Output "zig test std/std.zig..." |
| 58 | |||
| 58 | & "$ZIGINSTALLDIR\bin\zig.exe" test "$ZIGLIBDIR\std\std.zig" ` | 59 | & "$ZIGINSTALLDIR\bin\zig.exe" test "$ZIGLIBDIR\std\std.zig" ` |
| 59 | --zig-lib-dir "$ZIGLIBDIR" ` | 60 | --zig-lib-dir "$ZIGLIBDIR" ` |
| 60 | -femit-docs ` | 61 | -femit-docs ` |
| 61 | -fno-emit-bin | 62 | -fno-emit-bin |
| 62 | CheckLastExitCode | 63 | CheckLastExitCode |
| 63 | Write-Output "::endgroup::" | ||
| \ No newline at end of file | |||