diff --git a/ci/azure/linux_script b/ci/azure/linux_script index 2bc940206..9ada148a7 100755 --- 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 index ca587eed8..fdc1704fb 100755 --- 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