Skip to content

Commit 36261a2

Browse files
authored
Merge pull request #265 from lukaszstolarczuk/remove-nproc
[CI] Remove nproc param from workflows' matrices
2 parents f78d5a1 + 94a8c8a commit 36261a2

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

.github/workflows/codeql.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@ jobs:
2525
os: [ubuntu-latest, windows-latest]
2626
include:
2727
- os: ubuntu-latest
28-
nproc: $(nproc)
2928
pool_scalable: 'ON'
3029
# Windows doesn't recognize 'CMAKE_BUILD_TYPE', it uses '--config' param in build command
3130
extra_build_option: ['-DCMAKE_BUILD_TYPE=Release']
3231
- os: windows-latest
33-
nproc: $Env:NUMBER_OF_PROCESSORS
3432
pool_scalable: 'OFF'
3533
runs-on: ${{matrix.os}}
3634

@@ -63,7 +61,7 @@ jobs:
6361
-DUMF_BUILD_LIBUMF_POOL_SCALABLE=${{matrix.pool_scalable}}
6462
6563
- name: Build
66-
run: cmake --build ${{github.workspace}}/build --config Release -j ${{matrix.nproc}}
64+
run: cmake --build ${{github.workspace}}/build --config Release -j
6765

6866
- name: Perform CodeQL Analysis
6967
uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2

.github/workflows/pr_push.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,24 @@ jobs:
1717
matrix:
1818
include:
1919
- os: windows-latest
20-
nproc: $Env:NUMBER_OF_PROCESSORS
2120
pool_scalable: 'OFF'
2221
disjoint: 'OFF'
2322
jemalloc: 'OFF'
2423
# pure C build (Windows)
2524
- os: windows-latest
26-
nproc: $Env:NUMBER_OF_PROCESSORS
2725
pool_scalable: 'OFF'
2826
disjoint: 'OFF'
2927
jemalloc: 'OFF'
3028
# Tests' building is off for a pure C build
3129
extra_build_options: '-DUMF_BUILD_TESTS=OFF'
3230
- os: ubuntu-latest
33-
nproc: '$(nproc)'
3431
pool_scalable: 'ON'
3532
disjoint: 'ON'
3633
jemalloc: 'ON'
3734
# Windows doesn't recognize 'CMAKE_BUILD_TYPE', it uses '--config' param in build command
3835
extra_build_options: '-DCMAKE_BUILD_TYPE=Release -DUMF_BUILD_BENCHMARKS=ON -DUMF_BUILD_BENCHMARKS_MT=ON'
3936
# pure C build (Linux)
4037
- os: ubuntu-latest
41-
nproc: '$(nproc)'
4238
pool_scalable: 'ON'
4339
disjoint: 'OFF'
4440
jemalloc: 'ON'
@@ -72,7 +68,7 @@ jobs:
7268
${{matrix.extra_build_options}}
7369
7470
- name: Build
75-
run: cmake --build ${{github.workspace}}/build --config Release -j ${{matrix.nproc}}
71+
run: cmake --build ${{github.workspace}}/build --config Release -j
7672

7773
- name: Run examples
7874
working-directory: ${{github.workspace}}/build

0 commit comments

Comments
 (0)