ci: parallelize more, tidy up cmake commands (distcheck, macos)

Also enable `-DCURL_WERROR=ON` in the Linux cmake build test.

Closes #13343

diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
index c09927e7cef4264c2516242880c48849ece1e30f..765193c5083d067d58d5d1ec2f13a90bed7c33d3 100644 (file)
--- a/.github/workflows/distcheck.yml
+++ b/.github/workflows/distcheck.yml
@@ -60,9 +60,9 @@ jobs:
           tar xvf curl-99.98.97.tar.gz
           pushd curl-99.98.97
           ./configure --prefix=$HOME/temp --without-ssl --without-libpsl
-          make
-          make test-ci
-          make install
+          make -j3
+          make -j3 test-ci
+          make -j3 install
           popd
           # basic check of the installed files
           bash scripts/installcheck.sh $HOME/temp
@@ -85,8 +85,8 @@ jobs:
           mkdir build
           pushd build
           ../curl-99.98.97/configure --without-ssl --without-libpsl
-          make
-          make test-ci
+          make -j3
+          make -j3 test-ci
           popd
           rm -rf build
           rm -rf curl-99.98.97
@@ -126,8 +126,6 @@ jobs:
           echo "::stop-commands::$(uuidgen)"
           tar xvf curl-99.98.97.tar.gz
           pushd curl-99.98.97
-          mkdir build
-          pushd build
-          cmake ..
-          make
+          cmake -B build -DCURL_WERROR=ON
+          make -C build -j3
         name: 'verify out-of-tree cmake build'

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 1d5f2a9e32585599298940c69265afa3922efd11..5766b1836313415f190736a39ad9ee896f7098a3 100644 (file)
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -239,8 +239,8 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - run: cmake -S. -Bbuild -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON ${{ matrix.build.generate }}
+      - run: cmake -B build -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON ${{ matrix.build.generate }}
         name: 'cmake generate'
 
-      - run: cmake --build build
+      - run: cmake --build build --parallel 3
         name: 'cmake build'