diff --git a/.github/workflows/reusable_basic.yml b/.github/workflows/reusable_basic.yml index b30bfed4c8..34e7b187f0 100644 --- a/.github/workflows/reusable_basic.yml +++ b/.github/workflows/reusable_basic.yml @@ -126,6 +126,11 @@ jobs: sudo apt-get update sudo apt-get install -y clang cmake libnuma-dev lcov + - name: Install hwloc + if: matrix.disable_hwloc == 'OFF' + run: | + sudo apt-get install -y libhwloc-dev + - name: Install TBB apt package if: matrix.install_tbb == 'ON' run: | @@ -144,9 +149,6 @@ jobs: if: matrix.compiler.cxx == 'g++-7' run: sudo apt-get install -y ${{matrix.compiler.cxx}} - - name: Install libhwloc - run: .github/scripts/install_hwloc.sh - - name: Get UMF version run: | VERSION=$(git describe --tags --abbrev=0 | grep -oP '\d+\.\d+\.\d+') diff --git a/.github/workflows/reusable_compatibility.yml b/.github/workflows/reusable_compatibility.yml index f90416a7da..12ad0bf109 100644 --- a/.github/workflows/reusable_compatibility.yml +++ b/.github/workflows/reusable_compatibility.yml @@ -23,7 +23,7 @@ jobs: - name: Install apt packages run: | sudo apt-get update - sudo apt-get install -y clang cmake hwloc libnuma-dev libtbb-dev + sudo apt-get install -y clang cmake hwloc libhwloc-dev libnuma-dev libtbb-dev - name: Checkout "tag" UMF version uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -32,10 +32,6 @@ jobs: ref: refs/tags/${{inputs.tag}} path: ${{github.workspace}}/tag_version - - name: Install libhwloc - working-directory: ${{github.workspace}}/tag_version - run: .github/scripts/install_hwloc.sh - - name: Checkout latest UMF version uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: