Merge pull request #5780 from libgit2/ethomson/ci

ci: don't use ninja on macOS

.github/workflows/main.yml

@@ -153,7 +153,6 @@ jobs:
           env:
             CC: clang
             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
             SKIP_SSH_TESTS: true
             SKIP_NEGOTIATE_TESTS: true

.github/workflows/nightly.yml

@@ -112,7 +112,6 @@ jobs:
           env:
             CC: clang
             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
             SKIP_SSH_TESTS: true
             SKIP_NEGOTIATE_TESTS: true

ci/build.sh

@@ -33,6 +33,9 @@ if [ -f "/etc/debian_version" ]; then
 	(source /etc/lsb-release && echo "${DISTRIB_DESCRIPTION}") | indent
 fi
 
+CORES=$(getconf _NPROCESSORS_ONLN || true)
+echo "Number of cores: ${CORES:-(Unknown)}"
+
 echo "Kernel version:"
 uname -a 2>&1 | indent
 
@@ -64,4 +67,12 @@ echo "##########################################################################
 echo "## Building libgit2"
 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[@]}"