zig

commit 3b4e29f1ad690d4437aa4d0cb1c7f01c26b76c4a (tree)
parent 834e8ac2dcdec6e1055a6c90600bcc120484176e
Author: Noam Preil <pleasantatk@gmail.com>
Date:   Wed, 27 May 2020 14:17:46 -0400

[CI] Use ninja on Azura and Drone

Diffstat:
M
ci/azure/linux_script
 | 
6
+++---
M
ci/drone/linux_script
 | 
6
+++---

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ci/azure/linux_script b/ci/azure/linux_script
@@ -12,7 +12,7 @@ sudo apt-get update -q
 
 sudo apt-get remove -y llvm-*
 sudo rm -rf /usr/local/*
-sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev liblld-10-dev cmake s3cmd gcc-7 g++-7
+sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev liblld-10-dev cmake s3cmd gcc-7 g++-7 ninja-build
 
 QEMUBASE="qemu-linux-x86_64-5.0.0-z2"
 wget https://ziglang.org/deps/$QEMUBASE.tar.xz
@@ -48,8 +48,8 @@ export CC=gcc-7
 export CXX=g++-7
 mkdir build
 cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release
-make -j$(nproc) install
+cmake .. -DCMAKE_BUILD_TYPE=Release -GNinja
+ninja install
 ./zig build test -Denable-qemu -Denable-wasmtime
 VERSION="$(./zig version)"
 
diff --git a/ci/drone/linux_script b/ci/drone/linux_script
@@ -8,7 +8,7 @@ BUILDDIR="$(pwd)"
 DISTDIR="$(pwd)/dist"
 
 apk update
-apk add py3-pip xz perl-utils jq curl
+apk add py3-pip xz perl-utils jq curl samurai
 pip3 install s3cmd
 
 # Make the `zig version` number consistent.
@@ -17,9 +17,9 @@ git config core.abbrev 9
 
 mkdir build
 cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release "-DCMAKE_INSTALL_PREFIX=$DISTDIR" -DZIG_STATIC=ON -DCMAKE_PREFIX_PATH=/deps/local
+cmake .. -DCMAKE_BUILD_TYPE=Release "-DCMAKE_INSTALL_PREFIX=$DISTDIR" -DZIG_STATIC=ON -DCMAKE_PREFIX_PATH=/deps/local -GNinja
 
-make -j$(nproc) install
+samu install
 ./zig build test -Dskip-release -Dskip-non-native
 
 if [ -z "$DRONE_PULL_REQUEST" ]; then