Commit 75888f27 by Edward Thomson

ci: don't use ninja on macOS

Ninja is not installed by default on the macOS machines; stop trying to
use it.  Instead use `make -j` which should be roughly equivalent in
performance but supported everywhere.
parent 674875dc
...@@ -153,7 +153,6 @@ jobs: ...@@ -153,7 +153,6 @@ jobs:
env: env:
CC: clang CC: clang
CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON
CMAKE_GENERATOR: Ninja
PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig
SKIP_SSH_TESTS: true SKIP_SSH_TESTS: true
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
......
...@@ -112,7 +112,6 @@ jobs: ...@@ -112,7 +112,6 @@ jobs:
env: env:
CC: clang CC: clang
CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON
CMAKE_GENERATOR: Ninja
PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig
SKIP_SSH_TESTS: true SKIP_SSH_TESTS: true
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
......
...@@ -33,6 +33,9 @@ if [ -f "/etc/debian_version" ]; then ...@@ -33,6 +33,9 @@ if [ -f "/etc/debian_version" ]; then
(source /etc/lsb-release && echo "${DISTRIB_DESCRIPTION}") | indent (source /etc/lsb-release && echo "${DISTRIB_DESCRIPTION}") | indent
fi fi
CORES=$(getconf _NPROCESSORS_ONLN || true)
echo "Number of cores: ${CORES:-(Unknown)}"
echo "Kernel version:" echo "Kernel version:"
uname -a 2>&1 | indent uname -a 2>&1 | indent
...@@ -64,4 +67,12 @@ echo "########################################################################## ...@@ -64,4 +67,12 @@ echo "##########################################################################
echo "## Building libgit2" echo "## Building libgit2"
echo "##############################################################################" echo "##############################################################################"
env PATH="${BUILD_PATH}" "${CMAKE}" --build . # Determine parallelism; newer cmake supports `--build --parallel` but
# we cannot yet rely on that.
if [ "${CMAKE_GENERATOR}" = "Unix Makefiles" -a "${CORES}" != "" ]; then
BUILDER=(make -j ${CORES})
else
BUILDER=("${CMAKE}" --build .)
fi
env PATH="${BUILD_PATH}" "${BUILDER[@]}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment