Skip to content

Commit 96e7a40

Browse files
Merge pull request #1271 from PatKamin/remove-hwloc-install
[CI] Install hwloc from apt instead of building from sources
2 parents a0b25bd + c0bc9c9 commit 96e7a40

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/workflows/reusable_basic.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ jobs:
126126
sudo apt-get update
127127
sudo apt-get install -y clang cmake libnuma-dev lcov
128128
129+
- name: Install hwloc
130+
if: matrix.disable_hwloc == 'OFF'
131+
run: |
132+
sudo apt-get install -y libhwloc-dev
133+
129134
- name: Install TBB apt package
130135
if: matrix.install_tbb == 'ON'
131136
run: |
@@ -144,9 +149,6 @@ jobs:
144149
if: matrix.compiler.cxx == 'g++-7'
145150
run: sudo apt-get install -y ${{matrix.compiler.cxx}}
146151

147-
- name: Install libhwloc
148-
run: .github/scripts/install_hwloc.sh
149-
150152
- name: Get UMF version
151153
run: |
152154
VERSION=$(git describe --tags --abbrev=0 | grep -oP '\d+\.\d+\.\d+')

.github/workflows/reusable_compatibility.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Install apt packages
2424
run: |
2525
sudo apt-get update
26-
sudo apt-get install -y clang cmake hwloc libnuma-dev libtbb-dev
26+
sudo apt-get install -y clang cmake hwloc libhwloc-dev libnuma-dev libtbb-dev
2727
2828
- name: Checkout "tag" UMF version
2929
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -32,10 +32,6 @@ jobs:
3232
ref: refs/tags/${{inputs.tag}}
3333
path: ${{github.workspace}}/tag_version
3434

35-
- name: Install libhwloc
36-
working-directory: ${{github.workspace}}/tag_version
37-
run: .github/scripts/install_hwloc.sh
38-
3935
- name: Checkout latest UMF version
4036
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4137
with:

0 commit comments

Comments
 (0)