From: Viktor Szakats <commit@vsz.me>
Date: Wed, 23 Apr 2025 12:13:55 +0000 (+0200)
Subject: GHA: use more Ninja
X-Git-Tag: curl-8_14_0~236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5852a0bedf16813369349699aac1d650274c5e53;p=thirdparty%2Fcurl.git

GHA: use more Ninja

Use it for AmigaOS, Android, dl-mingw 7.3.0 and 6.4.0 Windows builds.

Also drop explicit ninja installs.

dl-mingw:
Before:
7.3.0: https://github.com/curl/curl/actions/runs/14617346216/job/41008536465
6.4.0: https://github.com/curl/curl/actions/runs/14617346216/job/41008540878
After:
7.3.0: https://github.com/curl/curl/actions/runs/14617983032/job/41010584040?pr=17153
6.4.0: https://github.com/curl/curl/actions/runs/14617983032/job/41010586490?pr=17153

Follow-up to a36655224356c10d70bcc566ce60f82af795ca90 #17115
Ref: https://github.com/actions/runner-images/issues/11391

Closes #17153
---

diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
index 1d6b761050..f21192dfd9 100644
--- a/.github/workflows/distcheck.yml
+++ b/.github/workflows/distcheck.yml
@@ -178,7 +178,7 @@ jobs:
       - name: 'install prereqs'
         run: |
           if [[ '${{ matrix.image }}' = *'ubuntu'* ]]; then
-            sudo apt-get -o Dpkg::Use-Pty=0 install ninja-build libpsl-dev libssl-dev
+            sudo apt-get -o Dpkg::Use-Pty=0 install libpsl-dev libssl-dev
           else
             brew install libpsl openssl
           fi
diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml
index 4a36b8039a..c6954bb9d3 100644
--- a/.github/workflows/http3-linux.yml
+++ b/.github/workflows/http3-linux.yml
@@ -333,7 +333,7 @@ jobs:
           sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get -o Dpkg::Use-Pty=0 update
           sudo apt-get -o Dpkg::Use-Pty=0 install \
-            libtool autoconf automake ninja-build pkgconf stunnel4 \
+            libtool autoconf automake pkgconf stunnel4 \
             libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev \
             nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin \
             libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools \
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index cdc2c6147f..09554fd3fd 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -302,7 +302,7 @@ jobs:
           sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get -o Dpkg::Use-Pty=0 update
           sudo apt-get -o Dpkg::Use-Pty=0 install \
-            libtool autoconf automake pkgconf ninja-build \
+            libtool autoconf automake pkgconf \
             ${{ !contains(matrix.build.install_steps, 'skipall') && !contains(matrix.build.install_steps, 'skiprun') && 'stunnel4' || '' }} \
             libpsl-dev libbrotli-dev libzstd-dev \
             ${{ matrix.build.install_packages }} \
diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml
index fac3cce282..1308210b9b 100644
--- a/.github/workflows/non-native.yml
+++ b/.github/workflows/non-native.yml
@@ -458,7 +458,7 @@ jobs:
         run: |
           export PKG_CONFIG_PATH="$VCPKG_INSTALLATION_ROOT/installed/arm64-android/lib/pkgconfig"
           if [ '${{ matrix.build }}' = 'cmake' ]; then  # https://developer.android.com/ndk/guides/cmake
-            cmake -B bld \
+            cmake -B bld -G Ninja \
               -DANDROID_ABI=arm64-v8a \
               -DANDROID_PLATFORM='android-${{ matrix.platform }}' \
               -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" \
@@ -546,7 +546,7 @@ jobs:
       - name: 'configure'
         run: |
           if [ '${{ matrix.build }}' = 'cmake' ]; then
-            cmake -B bld \
+            cmake -B bld -G Ninja \
               -DAMIGA=1 \
               -DCMAKE_SYSTEM_NAME=Generic \
               -DCMAKE_SYSTEM_PROCESSOR=m68k \
@@ -626,7 +626,7 @@ jobs:
       fail-fast: false
     steps:
       - name: 'install packages'
-        run: sudo apt-get -o Dpkg::Use-Pty=0 install libfl2 ${{ matrix.build == 'cmake' && 'ninja-build' || '' }}
+        run: sudo apt-get -o Dpkg::Use-Pty=0 install libfl2
 
       - name: 'cache compiler (djgpp)'
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f75e1c2fd8..adcf353cac 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -467,7 +467,7 @@ jobs:
           for _chkprefill in '' ${{ matrix.chkprefill }}; do
             options=''
             [ "${_chkprefill}" = '_chkprefill' ] && options+=' -D_CURL_PREFILL=OFF'
-            cmake -B "bld${_chkprefill}" -G "${{ contains(matrix.url, '/winlibs_mingw/') && 'Ninja' || 'MSYS Makefiles' }}" ${options} \
+            cmake -B "bld${_chkprefill}" -G Ninja ${options} \
               -DCMAKE_C_COMPILER=gcc \
               -DCMAKE_BUILD_TYPE='${{ matrix.type }}' \
               -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=30 -DCURL_TEST_BUNDLES=ON \
@@ -562,7 +562,6 @@ jobs:
         timeout-minutes: 5
         run: |
           sudo apt-get -o Dpkg::Use-Pty=0 install mingw-w64 \
-            ${{ matrix.build == 'cmake' && 'ninja-build' || '' }} \
             ${{ matrix.compiler == 'clang-tidy' && 'clang' || '' }}
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4