Skip to content

Commit 79e64f6

Browse files
[CI] Update Windows version; 2019 is going EOL
Use 'latest' label where we don't care about a specific Win version. Update clang-cl Windows build to use Ninja - VS and (default) NMake were making problems.
1 parent 14d4228 commit 79e64f6

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ jobs:
207207
VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows"
208208
strategy:
209209
matrix:
210-
os: ['windows-2019', 'windows-2022']
210+
os: ['windows-2022', 'windows-2025']
211211
build_type: [Debug]
212212
compiler: [{c: icx, cxx: icx}]
213213
shared_library: ['ON', 'OFF']

.github/workflows/reusable_basic.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -235,33 +235,37 @@ jobs:
235235
VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows"
236236
VCPKG_PATH_BIN: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows/bin;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows/bin;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows/bin"
237237
strategy:
238+
# TODO: add '3.14.0-win64-x64' CMake testing
238239
matrix:
239-
os: ['windows-2019', 'windows-2022']
240+
os: ['windows-2022', 'windows-2025']
240241
build_type: [Debug, Release]
241242
compiler: [{c: cl, cxx: cl}]
242243
shared_library: ['ON', 'OFF']
243244
level_zero_provider: ['ON']
244245
cuda_provider: ['ON']
245246
cmake_ver: ['default']
246247
include:
247-
- os: 'windows-2019'
248-
# clang build fails on Windows 2022
249-
build_type: Release
248+
# clang-cl works well with Ninja, Debug build
249+
# For VS generator it produces build errors not related to UMF
250+
- os: 'windows-2025'
251+
build_type: Debug
250252
compiler: {c: clang-cl, cxx: clang-cl}
253+
extra_build_options: '-G Ninja'
251254
shared_library: 'ON'
252255
level_zero_provider: 'ON'
253256
cuda_provider: 'ON'
254-
toolset: "-T ClangCL"
255-
cmake_ver: '3.14.0-win64-x64'
256-
- os: 'windows-2022'
257+
cmake_ver: 'default'
258+
# Custom CMake and umfd enabled
259+
- os: 'windows-2025'
257260
build_type: Release
258261
compiler: {c: cl, cxx: cl}
259262
shared_library: 'ON'
260263
level_zero_provider: 'ON'
261264
cuda_provider: 'ON'
262265
umfd_lib: 'ON'
263266
cmake_ver: '3.28.0-windows-x86_64'
264-
- os: 'windows-2022'
267+
# L0/CUDA providers disabled
268+
- os: 'windows-2025'
265269
build_type: Release
266270
compiler: {c: cl, cxx: cl}
267271
shared_library: 'ON'
@@ -322,7 +326,7 @@ jobs:
322326
run: >
323327
cmake
324328
-B ${{env.BUILD_DIR}}
325-
${{matrix.toolset}}
329+
${{matrix.extra_build_options || ''}}
326330
-DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
327331
-DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
328332
-DCMAKE_C_COMPILER=${{matrix.compiler.c}}
@@ -382,7 +386,7 @@ jobs:
382386
matrix:
383387
build_type: [Release]
384388

385-
runs-on: 'windows-2022'
389+
runs-on: 'windows-latest'
386390

387391
steps:
388392
- name: Checkout
@@ -424,7 +428,7 @@ jobs:
424428
matrix:
425429
build_type: [Release]
426430

427-
runs-on: 'windows-2022'
431+
runs-on: 'windows-latest'
428432

429433
steps:
430434
- name: Checkout
@@ -466,7 +470,7 @@ jobs:
466470
matrix:
467471
build_type: [Release]
468472

469-
runs-on: 'windows-2022'
473+
runs-on: 'windows-latest'
470474

471475
steps:
472476
- name: Checkout

.github/workflows/reusable_compatibility.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
env:
127127
VCPKG_PATH: "${{github.workspace}}/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/vcpkg/packages/jemalloc_x64-windows"
128128
VCPKG_BIN_PATH: "${{github.workspace}}/vcpkg/packages/hwloc_x64-windows/bin;${{github.workspace}}/vcpkg/packages/tbb_x64-windows/bin;${{github.workspace}}/vcpkg/packages/jemalloc_x64-windows/bin"
129-
runs-on: "windows-2022"
129+
runs-on: "windows-latest"
130130

131131
steps:
132132
- name: Checkout "tag" UMF version

.github/workflows/reusable_sanitizers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ jobs:
8282
compiler: [{c: cl, cxx: cl}, {c: clang-cl, cxx: clang-cl}]
8383
# Only ASAN is supported
8484
sanitizers: [{asan: ON}]
85-
name: Sanitizers (windows-2022, compilers=${{matrix.compiler.c}}/${{matrix.compiler.cxx}}, asan=${{matrix.sanitizers.asan}})
86-
runs-on: windows-2022
85+
name: Sanitizers (windows-latest, compilers=${{matrix.compiler.c}}/${{matrix.compiler.cxx}}, asan=${{matrix.sanitizers.asan}})
86+
runs-on: windows-latest
8787

8888
steps:
8989
- name: Checkout

0 commit comments

Comments
 (0)