Skip to content

Commit eb821ba

Browse files
igchorbratpiorka
authored andcommitted
Add more CI runs with UMF_LINK_HWLOC_STATICALLY=1
1 parent daffca6 commit eb821ba

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

.github/workflows/basic.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
level_zero_provider: ['ON']
2525
install_tbb: ['ON']
2626
disable_hwloc: ['OFF']
27+
link_hwloc_statically: ['OFF']
2728
include:
2829
- os: 'ubuntu-20.04'
2930
build_type: Release
@@ -71,12 +72,19 @@ jobs:
7172
level_zero_provider: 'ON'
7273
install_tbb: 'OFF'
7374
- os: 'ubuntu-22.04'
74-
build_type: Release
75+
build_type: Debug
7576
compiler: {c: gcc, cxx: g++}
7677
shared_library: 'ON'
7778
level_zero_provider: 'ON'
7879
install_tbb: 'ON'
7980
disable_hwloc: 'ON'
81+
- os: 'ubuntu-22.04'
82+
build_type: Release
83+
compiler: {c: gcc, cxx: g++}
84+
shared_library: 'ON'
85+
level_zero_provider: 'ON'
86+
install_tbb: 'ON'
87+
link_hwloc_statically: 'ON'
8088
runs-on: ${{matrix.os}}
8189

8290
steps:
@@ -131,6 +139,7 @@ jobs:
131139
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
132140
-DUMF_TESTS_FAIL_ON_SKIP=ON
133141
-DUMF_DISABLE_HWLOC=${{matrix.disable_hwloc}}
142+
-DUMF_LINK_HWLOC_STATICALLY=${{matrix.link_hwloc_statically}}
134143
135144
- name: Build UMF
136145
run: cmake --build ${{env.BUILD_DIR}} -j $(nproc)
@@ -349,7 +358,7 @@ jobs:
349358
run: python3 -m pip install -r third_party/requirements.txt
350359

351360
- name: Install hwloc
352-
run: brew install hwloc jemalloc tbb autoconf automake libtool
361+
run: brew install hwloc jemalloc tbb
353362

354363
- name: Configure build
355364
run: >
@@ -376,6 +385,6 @@ jobs:
376385
--build-type ${{env.BUILD_TYPE}}
377386
--disjoint-pool
378387
--jemalloc-pool
379-
${{ matrix.link_hwloc_statically != 'ON' && '--proxy' || '' }}
388+
--proxy
380389
--umf-version ${{env.UMF_VERSION}}
381390
--shared-library

0 commit comments

Comments
 (0)