Skip to content

Commit b7d2a04

Browse files
authored
do not hard-code job number for MinGW/Cygwin builds in CI (#7239)
1 parent 960862b commit b7d2a04

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/CI-cygwin.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
# Cygwin will always link the binaries even if they already exist. The linking is also extremely slow. So just run the "check" target which includes all the binaries.
5050
- name: Build all and run test
5151
run: |
52-
C:\cygwin\bin\bash.exe -l -c cd %GITHUB_WORKSPACE% && make VERBOSE=1 -j2 check
52+
C:\cygwin\bin\bash.exe -l -c cd %GITHUB_WORKSPACE% && make VERBOSE=1 -j%NUMBER_OF_PROCESSORS% check
5353
5454
- name: Extra test for misra
5555
run: |

.github/workflows/CI-mingw.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,22 @@ jobs:
5454
run: |
5555
export PATH="/mingw64/lib/ccache/bin:$PATH"
5656
# set RDYNAMIC to work around broken MinGW detection
57-
make VERBOSE=1 RDYNAMIC=-lshlwapi -j2 cppcheck
57+
make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) cppcheck
5858
env:
5959
LDFLAGS: -fuse-ld=lld # use lld for faster linking
6060

6161
- name: Build test
6262
run: |
6363
export PATH="/mingw64/lib/ccache/bin:$PATH"
6464
# set RDYNAMIC to work around broken MinGW detection
65-
make VERBOSE=1 RDYNAMIC=-lshlwapi -j2 testrunner
65+
make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) testrunner
6666
env:
6767
LDFLAGS: -fuse-ld=lld # use lld for faster linking
6868

6969
- name: Run test
7070
run: |
7171
export PATH="/mingw64/lib/ccache/bin:$PATH"
7272
# set RDYNAMIC to work around broken MinGW detection
73-
make VERBOSE=1 RDYNAMIC=-lshlwapi -j2 check
73+
make VERBOSE=1 RDYNAMIC=-lshlwapi -j$(nproc) check
7474
env:
7575
LDFLAGS: -fuse-ld=lld # use lld for faster linking

.github/workflows/scriptcheck.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ jobs:
218218

219219
- name: run dmake
220220
run: |
221-
make -j2 CXXFLAGS="-w" run-dmake
221+
make -j3 CXXFLAGS="-w" run-dmake
222222
223223
- name: check diff
224224
run: |

0 commit comments

Comments
 (0)