GHA: bump all build jobs to nproc+1

- bump rest of the workflows (windows, macos, distrocheck).

- non-native virtualized envs have 2 CPUs, bump down accordingly.
  (for `vmactions/omnios-vm` it's just a guess.)

- bump all to nproc + 1.

Follow-up to e838b341a08b44d4a8486fb0d3f15d12fc794c62 #12927
Closes #13807

diff --git a/.github/workflows/awslc.yml b/.github/workflows/awslc.yml
index efb2b45943388aff4e3f6f39cbfd749ba06ade54..33b27222cda9e7131c5469804b8a51aa20d6c10e 100644 (file)
--- a/.github/workflows/awslc.yml
+++ b/.github/workflows/awslc.yml
@@ -41,7 +41,7 @@ concurrency:
 permissions: {}
 
 env:
-  MAKEFLAGS: -j 4
+  MAKEFLAGS: -j 5
 
   # renovate: datasource=github-tags depName=awslabs/aws-lc versioning=semver registryUrl=https://github.com
   awslc-version: 1.28.0

diff --git a/.github/workflows/curl-for-win.yml b/.github/workflows/curl-for-win.yml
index 8c714ea12b9c993da6ecd476c415b0dab3f95a35..2c81cbccaec9661a60bf3f020e4da2840dc488ff 100644 (file)
--- a/.github/workflows/curl-for-win.yml
+++ b/.github/workflows/curl-for-win.yml
@@ -22,7 +22,7 @@ permissions: {}
 env:
   CW_NOGET: 'curl trurl'
   CW_MAP: '0'
-  CW_JOBS: '3'
+  CW_JOBS: '5'
   CW_NOPKG: '1'
   DOCKER_CONTENT_TRUST: '1'
 
@@ -54,6 +54,8 @@ jobs:
   mac-clang:
     runs-on: macos-latest
     timeout-minutes: 30
+    env:
+      CW_JOBS: '4'
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:

diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
index 6f899876100de113819af58bce34107a6a102483..97a5e3e11b75914c6e4b31ec4989321f5f63d380 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 -j3
-          make -j3 test-ci
-          make -j3 install
+          make -j5
+          make -j5 test-ci
+          make -j5 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 -j3
-          make -j3 test-ci
+          make -j5
+          make -j5 test-ci
           popd
           rm -rf build
           rm -rf curl-99.98.97
@@ -108,9 +108,9 @@ jobs:
           mkdir build
           pushd build
           ../configure --without-ssl --enable-debug "--prefix=${PWD}/pkg" --without-libpsl
-          make -j3
-          make -j3 test-ci
-          make -j3 install
+          make -j5
+          make -j5 test-ci
+          make -j5 install
         name: 'verify out-of-tree autotools debug build'
 
   verify-out-of-tree-cmake:
@@ -127,5 +127,5 @@ jobs:
           tar xvf curl-99.98.97.tar.gz
           pushd curl-99.98.97
           cmake -B build -DCURL_WERROR=ON
-          make -C build -j3
+          make -C build -j5
         name: 'verify out-of-tree cmake build'

diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml
index ef0ebd0783aec1f4f8c7e79de2d4a9d39fbcf1ac..605a16877cb982934aaf59b86428d0b251072891 100644 (file)
--- a/.github/workflows/http3-linux.yml
+++ b/.github/workflows/http3-linux.yml
@@ -45,7 +45,7 @@ concurrency:
 permissions: {}
 
 env:
-  MAKEFLAGS: -j 4
+  MAKEFLAGS: -j 5
   # handled in renovate.json
   openssl3-version: openssl-3.3.0
   # unhandled

diff --git a/.github/workflows/linux-old.yml b/.github/workflows/linux-old.yml
index 2a7bb6b10721f41321f62ec8979151be92bc81c8..7685ffc07c907322e872dece779278a7cd728914 100644 (file)
--- a/.github/workflows/linux-old.yml
+++ b/.github/workflows/linux-old.yml
@@ -50,7 +50,7 @@ on:
 permissions: {}
 
 env:
-  MAKEFLAGS: -j 3
+  MAKEFLAGS: -j 5
   DEBIAN_FRONTEND: noninteractive
 
 jobs:

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 26e2a0155a9c89f64ae2bd9509051c2a907d5a49..608666c6bff55e86bc074e37de97d4589418582e 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -40,7 +40,7 @@ concurrency:
 permissions: {}
 
 env:
-  MAKEFLAGS: -j 4
+  MAKEFLAGS: -j 5
   # unhandled
   bearssl-version: 0.6
   # renovate: datasource=github-tags depName=libressl-portable/portable versioning=semver registryUrl=https://github.com

diff --git a/.github/workflows/linux32.yml b/.github/workflows/linux32.yml
index 6c33d4ffd27dbb6658e16b9334e36ff48f057a0f..68c0c0b89e9e741812583731220b88faad448e70 100644 (file)
--- a/.github/workflows/linux32.yml
+++ b/.github/workflows/linux32.yml
@@ -44,7 +44,7 @@ concurrency:
 permissions: {}
 
 env:
-  MAKEFLAGS: -j 4
+  MAKEFLAGS: -j 5
 
 jobs:
   linux-i686:

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a743a16a8b880c857d986929985019c5f0311383..68dd60f80ca888483c707d72ecaec5e474dbe3c9 100644 (file)
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -41,7 +41,7 @@ permissions: {}
 
 env:
   DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
-  MAKEFLAGS: -j 3
+  MAKEFLAGS: -j 4
 
 jobs:
   autotools:

diff --git a/.github/workflows/torture.yml b/.github/workflows/torture.yml
index 7e4c0a93e122382a1d20c33a83863406c6dad73c..5155220cfb6fd1cd7234058f93d8446d2597516a 100644 (file)
--- a/.github/workflows/torture.yml
+++ b/.github/workflows/torture.yml
@@ -45,7 +45,7 @@ concurrency:
 permissions: {}
 
 env:
-  MAKEFLAGS: -j 4
+  MAKEFLAGS: -j 5
 
 jobs:
   autotools:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 1ad0ad7b97100120be025f9c1957b528c1d62399..828dfc3a5a996068f7b5e6fdcb83d278b51a1e28 100644 (file)
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -82,7 +82,7 @@ jobs:
         timeout-minutes: 10
         shell: C:\cygwin\bin\bash.exe '{0}'
         run: |
-          make -C bld -j3 V=1 install
+          make -C bld -j5 V=1 install
           find . -name '*.exe' -o -name '*.dll'
           bld/src/curl.exe --disable --version
 
@@ -91,14 +91,14 @@ jobs:
         timeout-minutes: 5
         shell: C:\cygwin\bin\bash.exe '{0}'
         run: |
-          make -C bld -j3 V=1 examples
+          make -C bld -j5 V=1 examples
 
       - name: 'autotools build tests'
         if: ${{ matrix.build == 'automake' && matrix.tflags != 'skipall' }}
         timeout-minutes: 15
         shell: C:\cygwin\bin\bash.exe '{0}'
         run: |
-          make -C bld -j3 -C tests V=1
+          make -C bld -j5 -C tests V=1
 
       - name: 'autotools run tests'
         if: ${{ matrix.build == 'automake' && matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
@@ -109,7 +109,7 @@ jobs:
           if [ -x "$(cygpath "${SYSTEMROOT}/System32/curl.exe")" ]; then
             TFLAGS+=" -ac $(cygpath "${SYSTEMROOT}/System32/curl.exe")"
           fi
-          make -C bld -j3 V=1 test-ci
+          make -C bld -j5 V=1 test-ci
 
       - name: 'cmake configure'
         if: ${{ matrix.build == 'cmake' }}
@@ -131,7 +131,7 @@ jobs:
         timeout-minutes: 10
         shell: C:\cygwin\bin\bash.exe '{0}'
         run: |
-          cmake --build bld --config '${{ matrix.type }}' --parallel 3
+          cmake --build bld --config '${{ matrix.type }}' --parallel 5
           [[ '${{ matrix.config }}' != *'BUILD_SHARED_LIBS=OFF'* ]] && cp -f -p bld/lib/*.dll bld/src/
           find . -name '*.exe' -o -name '*.dll'
           bld/src/curl.exe --disable --version
@@ -141,7 +141,7 @@ jobs:
         timeout-minutes: 15
         shell: C:\cygwin\bin\bash.exe '{0}'
         run: |
-          cmake --build bld --config '${{ matrix.type }}' --parallel 3 --target testdeps
+          cmake --build bld --config '${{ matrix.type }}' --parallel 5 --target testdeps
 
       - name: 'cmake run tests'
         if: ${{ matrix.build == 'cmake' && matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
@@ -209,7 +209,7 @@ jobs:
         timeout-minutes: 10
         shell: msys2 {0}
         run: |
-          make -C bld -j3 V=1 install
+          make -C bld -j5 V=1 install
           find . -name '*.exe' -o -name '*.dll'
           bld/src/curl.exe --disable --version
 
@@ -218,14 +218,14 @@ jobs:
         timeout-minutes: 5
         shell: msys2 {0}
         run: |
-          make -C bld -j3 V=1 examples
+          make -C bld -j5 V=1 examples
 
       - name: 'autotools build tests'
         if: ${{ matrix.build == 'autotools' && matrix.tflags != 'skipall' }}
         timeout-minutes: 10
         shell: msys2 {0}
         run: |
-          make -C bld -j3 -C tests V=1
+          make -C bld -j5 -C tests V=1
 
       - name: 'autotools run tests'
         if: ${{ matrix.build == 'autotools' && matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
@@ -236,7 +236,7 @@ jobs:
           if [ -x "$(cygpath "${SYSTEMROOT}/System32/curl.exe")" ]; then
             TFLAGS+=" -ac $(cygpath "${SYSTEMROOT}/System32/curl.exe")"
           fi
-          make -C bld -j3 V=1 test-ci
+          make -C bld -j5 V=1 test-ci
 
       - name: 'cmake configure'
         if: ${{ matrix.build == 'cmake' }}
@@ -279,7 +279,7 @@ jobs:
         timeout-minutes: 10
         shell: msys2 {0}
         run: |
-          cmake --build bld --config '${{ matrix.type }}' --parallel 3
+          cmake --build bld --config '${{ matrix.type }}' --parallel 5
           [[ '${{ matrix.config }}' != *'BUILD_SHARED_LIBS=OFF'* ]] && cp -f -p bld/lib/*.dll bld/src/
           find . -name '*.exe' -o -name '*.dll'
           bld/src/curl.exe --disable --version
@@ -289,7 +289,7 @@ jobs:
         timeout-minutes: 10
         shell: msys2 {0}
         run: |
-          cmake --build bld --config '${{ matrix.type }}' --parallel 3 --target testdeps
+          cmake --build bld --config '${{ matrix.type }}' --parallel 5 --target testdeps
 
       - name: 'cmake run tests'
         if: ${{ matrix.build == 'cmake' && matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
@@ -380,7 +380,7 @@ jobs:
         shell: C:\msys64\usr\bin\bash.exe {0}
         run: |
           export PATH="$(cygpath "${USERPROFILE}")/my-cache/mingw64/bin:/c/msys64/usr/bin:$PATH"
-          cmake --build bld --config '${{ matrix.type }}' --parallel 3
+          cmake --build bld --config '${{ matrix.type }}' --parallel 5
           [[ '${{ matrix.config }}' != *'BUILD_SHARED_LIBS=OFF'* ]] && cp -f -p bld/lib/*.dll bld/src/
           bld/src/curl.exe --disable --version
 
@@ -390,7 +390,7 @@ jobs:
         shell: C:\msys64\usr\bin\bash.exe {0}
         run: |
           export PATH="$(cygpath "${USERPROFILE}")/my-cache/mingw64/bin:/c/msys64/usr/bin:$PATH"
-          cmake --build bld --config '${{ matrix.type }}' --parallel 3 --target testdeps
+          cmake --build bld --config '${{ matrix.type }}' --parallel 5 --target testdeps
 
       - name: 'cmake run tests'
         if: ${{ matrix.build == 'cmake' && matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
@@ -450,7 +450,7 @@ jobs:
         timeout-minutes: 5
         shell: bash
         run: |
-          cmake --build bld --config '${{ matrix.type }}' --parallel 3
+          cmake --build bld --config '${{ matrix.type }}' --parallel 5
           [[ '${{ matrix.config }}' != *'BUILD_SHARED_LIBS=OFF'* ]] && cp -f -p bld/lib/*.dll bld/src/
           bld/src/curl.exe --disable --version
 
@@ -459,7 +459,7 @@ jobs:
         timeout-minutes: 10
         shell: bash
         run: |
-          cmake --build bld --config '${{ matrix.type }}' --parallel 3 --target testdeps
+          cmake --build bld --config '${{ matrix.type }}' --parallel 5 --target testdeps
 
       - name: 'cmake run tests'
         if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}

diff --git a/.github/workflows/wolfssl.yml b/.github/workflows/wolfssl.yml
index 97fcaae285f7d748e8ba124ae1cc7a5ef216e3f1..34b7c0e5f6febcffa15cc0f5a905e121f8f2aad1 100644 (file)
--- a/.github/workflows/wolfssl.yml
+++ b/.github/workflows/wolfssl.yml
@@ -45,7 +45,7 @@ concurrency:
 permissions: {}
 
 env:
-  MAKEFLAGS: -j 4
+  MAKEFLAGS: -j 5
 
 jobs:
   autotools: