From a36655224356c10d70bcc566ce60f82af795ca90 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Mon, 21 Apr 2025 04:00:36 +0200
Subject: [PATCH] GHA: always use Ninja on macos runners

It's installed by default on the macos runners now.

Closes #17115
---
 .github/workflows/distcheck.yml  | 2 +-
 .github/workflows/macos.yml      | 9 +++++++--
 .github/workflows/non-native.yml | 4 ++--
 .github/workflows/windows.yml    | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
index 1347c86c64..1d6b761050 100644
--- a/.github/workflows/distcheck.yml
+++ b/.github/workflows/distcheck.yml
@@ -180,7 +180,7 @@ jobs:
           if [[ '${{ matrix.image }}' = *'ubuntu'* ]]; then
             sudo apt-get -o Dpkg::Use-Pty=0 install ninja-build libpsl-dev libssl-dev
           else
-            brew install ninja libpsl openssl
+            brew install libpsl openssl
           fi
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 35ae822e8f..2131feb222 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -461,7 +461,7 @@ jobs:
             [ '${{ matrix.config }}' = 'SecureTransport' ] && options+=' -DCURL_USE_SECTRANSP=ON'
             [ -n '${{ matrix.macos-version-min }}' ] && options+=' -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.macos-version-min }}'
             # would pick up nghttp2, libidn2, and libssh2
-            cmake -B bld -D_CURL_PREFILL=ON \
+            cmake -B bld -G Ninja -D_CURL_PREFILL=ON \
               -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON \
               -DCMAKE_OSX_SYSROOT="${sysroot}" \
               -DCMAKE_C_COMPILER_TARGET="$(uname -m | sed 's/arm64/aarch64/')-apple-darwin$(uname -r)" \
@@ -501,7 +501,12 @@ jobs:
           grep -F '#define' bld/lib/curl_config.h | sort || true
 
       - name: 'build / ${{ matrix.build }}'
-        run: make -C bld V=1 VERBOSE=1
+        run: |
+          if [ '${{ matrix.build }}' = 'cmake' ]; then
+            cmake --build bld --verbose
+          else
+            make -C bld V=1
+          fi
 
       - name: 'curl version'
         run: bld/src/curl --disable --version
diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml
index d92800655e..fac3cce282 100644
--- a/.github/workflows/non-native.yml
+++ b/.github/workflows/non-native.yml
@@ -319,7 +319,7 @@ jobs:
             https://github.com/libressl/portable/releases/download/v${{ env.libressl-version }}/libressl-${{ env.libressl-version }}.tar.gz | tar -x
           cd libressl-${{ env.libressl-version }}
           # FIXME: on the 4.0.1 release, delete '-DHAVE_ENDIAN_H=0'
-          cmake -B . \
+          cmake -B . -G Ninja \
             -DHAVE_ENDIAN_H=0 \
             -DCMAKE_INSTALL_PREFIX="$HOME/libressl" \
             -DCMAKE_SYSTEM_NAME=iOS \
@@ -343,7 +343,7 @@ jobs:
           if [ -n '${{ matrix.build.generate }}' ]; then
             # https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-ios-tvos-visionos-or-watchos
             [ -n '${{ matrix.build.generator }}' ] && options='-G ${{ matrix.build.generator }}'
-            cmake -B bld -D_CURL_PREFILL=ON \
+            cmake -B bld -G Ninja -D_CURL_PREFILL=ON \
               -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON \
               -DCMAKE_SYSTEM_NAME=iOS \
               -DUSE_APPLE_IDN=ON \
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 53f33fca4b..58c8502509 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -677,7 +677,7 @@ jobs:
         run: |
           PATH="$HOME/opt/mingw32ce/bin:$PATH"
           if [ '${{ matrix.build }}' = 'cmake' ]; then
-            cmake -B bld \
+            cmake -B bld -G Ninja \
               -DCMAKE_SYSTEM_NAME=WindowsCE \
               -DCMAKE_SYSTEM_VERSION=8.0 \
               -DCMAKE_SYSTEM_PROCESSOR=arm \
-- 
2.47.2