Skip to content

Commit 8aac81b

Browse files
[CI] Clean up workflows a little
including: - get rid of specific toolkit version setup in Win ASAN job; the newest toolkit should be working fine now - MacOS small cleanup, to properly set job's name
1 parent 3ffd895 commit 8aac81b

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

.github/workflows/reusable_basic.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,9 @@ jobs:
517517
macos-build:
518518
strategy:
519519
matrix:
520-
os: ['macos-13', 'macos-14']
521520
include:
521+
- os: macos-13
522+
static_hwloc: 'OFF'
522523
- os: macos-14
523524
static_hwloc: 'ON'
524525
env:
@@ -544,7 +545,7 @@ jobs:
544545
run: brew install jemalloc tbb automake libtool
545546

546547
- name: Install hwloc
547-
if: ${{ !matrix.static_hwloc }}
548+
if: ${{ matrix.static_hwloc == 'OFF' }}
548549
run: brew install hwloc
549550

550551
- name: Get UMF version
@@ -565,7 +566,6 @@ jobs:
565566
-DUMF_BUILD_SHARED_LIBRARY=ON
566567
-DUMF_TESTS_FAIL_ON_SKIP=ON
567568
-DUMF_LINK_HWLOC_STATICALLY=${{matrix.static_hwloc}}
568-
${{matrix.static_hwloc}}
569569
570570
- name: Build UMF
571571
run: cmake --build ${{env.BUILD_DIR}} -j $(sysctl -n hw.logicalcpu)

.github/workflows/reusable_dax.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
shared_library: ['ON', 'OFF']
4444
name: DAX (ubuntu, build_type=${{matrix.build_type}}, shared_library=${{matrix.shared_library}})
4545
runs-on: ["DSS-DEVDAX", "DSS-Ubuntu"]
46-
46+
4747
steps:
4848
- name: Check configuration of the DEVDAX
4949
run: |

.github/workflows/reusable_proxy_lib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
build_type: [Release, Debug]
2020
compiler: [{c: gcc, cxx: g++}]
2121
proxy_lib_pool: ['SCALABLE', 'JEMALLOC']
22-
name: Proxy Library (ubuntu-22.04, build_type=${{matrix.build_type}}, compilers=${{matrix.compiler.c}}/${{matrix.compiler.cxx}}, proxy_lib_pool=${{matrix.proxy_lib_pool}})
22+
name: Proxy Library (ubuntu-22.04, build_type=${{matrix.build_type}}, compilers=${{matrix.compiler.c}}/${{matrix.compiler.cxx}}, proxy_lib_pool=${{matrix.proxy_lib_pool}})
2323
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-22.04' }}
2424

2525
steps:

.github/workflows/reusable_sanitizers.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,12 @@ jobs:
9191
with:
9292
fetch-depth: 0
9393

94-
# Use the latest MSVC toolset available, when compiling UMF with ASan.
95-
# Running binaries compiled with older toolsets results in a
96-
# 'STATUS_DLL_INIT_FAILED' error despite being linked with ASan from
97-
# the same toolset as the compiler being used.
98-
# https://github.com/actions/runner-images/issues/8891
94+
# Ensure that the required environment is set
95+
# Note: No need to specify version, the latest one will be used and should work fine
9996
- name: Setup MSVC dev command prompt
100-
if: matrix.sanitizers.asan == 'ON'
10197
uses: TheMrMilchmann/setup-msvc-dev@fb19abb8a41b3cf0340f5d1be17d420309232be6 # v3.0.1
10298
with:
10399
arch: x64
104-
toolset: '14'
105100

106101
- name: Initialize vcpkg
107102
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
@@ -112,7 +107,7 @@ jobs:
112107

113108
- name: Install dependencies
114109
run: vcpkg install --triplet x64-windows
115-
shell: pwsh # Specifies PowerShell as the shell for running the script.
110+
shell: pwsh
116111

117112
- name: Configure build
118113
run: >

0 commit comments

Comments
 (0)