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 e838b341a0 #12927
Closes #13807
This commit is contained in:
parent
03bd16e533
commit
464282ddfb
2
.github/workflows/awslc.yml
vendored
2
.github/workflows/awslc.yml
vendored
@ -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
|
||||
|
||||
4
.github/workflows/curl-for-win.yml
vendored
4
.github/workflows/curl-for-win.yml
vendored
@ -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:
|
||||
|
||||
18
.github/workflows/distcheck.yml
vendored
18
.github/workflows/distcheck.yml
vendored
@ -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'
|
||||
|
||||
2
.github/workflows/http3-linux.yml
vendored
2
.github/workflows/http3-linux.yml
vendored
@ -45,7 +45,7 @@ concurrency:
|
||||
permissions: {}
|
||||
|
||||
env:
|
||||
MAKEFLAGS: -j 4
|
||||
MAKEFLAGS: -j 5
|
||||
# handled in renovate.json
|
||||
openssl3-version: openssl-3.3.0
|
||||
# unhandled
|
||||
|
||||
2
.github/workflows/linux-old.yml
vendored
2
.github/workflows/linux-old.yml
vendored
@ -50,7 +50,7 @@ on:
|
||||
permissions: {}
|
||||
|
||||
env:
|
||||
MAKEFLAGS: -j 3
|
||||
MAKEFLAGS: -j 5
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
|
||||
jobs:
|
||||
|
||||
2
.github/workflows/linux.yml
vendored
2
.github/workflows/linux.yml
vendored
@ -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
|
||||
|
||||
2
.github/workflows/linux32.yml
vendored
2
.github/workflows/linux32.yml
vendored
@ -44,7 +44,7 @@ concurrency:
|
||||
permissions: {}
|
||||
|
||||
env:
|
||||
MAKEFLAGS: -j 4
|
||||
MAKEFLAGS: -j 5
|
||||
|
||||
jobs:
|
||||
linux-i686:
|
||||
|
||||
2
.github/workflows/macos.yml
vendored
2
.github/workflows/macos.yml
vendored
@ -41,7 +41,7 @@ permissions: {}
|
||||
|
||||
env:
|
||||
DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
|
||||
MAKEFLAGS: -j 3
|
||||
MAKEFLAGS: -j 4
|
||||
|
||||
jobs:
|
||||
autotools:
|
||||
|
||||
2
.github/workflows/torture.yml
vendored
2
.github/workflows/torture.yml
vendored
@ -45,7 +45,7 @@ concurrency:
|
||||
permissions: {}
|
||||
|
||||
env:
|
||||
MAKEFLAGS: -j 4
|
||||
MAKEFLAGS: -j 5
|
||||
|
||||
jobs:
|
||||
autotools:
|
||||
|
||||
32
.github/workflows/windows.yml
vendored
32
.github/workflows/windows.yml
vendored
@ -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' }}
|
||||
|
||||
2
.github/workflows/wolfssl.yml
vendored
2
.github/workflows/wolfssl.yml
vendored
@ -45,7 +45,7 @@ concurrency:
|
||||
permissions: {}
|
||||
|
||||
env:
|
||||
MAKEFLAGS: -j 4
|
||||
MAKEFLAGS: -j 5
|
||||
|
||||
jobs:
|
||||
autotools:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user