Skip to content

Commit 31b0527

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 7d33fd7 commit 31b0527

File tree

4 files changed

+27
-16
lines changed

4 files changed

+27
-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: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -236,32 +236,43 @@ jobs:
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:
238238
matrix:
239-
os: ['windows-2019', 'windows-2022']
239+
os: ['windows-2022', 'windows-2025']
240240
build_type: [Debug, Release]
241241
compiler: [{c: cl, cxx: cl}]
242242
shared_library: ['ON', 'OFF']
243243
level_zero_provider: ['ON']
244244
cuda_provider: ['ON']
245245
cmake_ver: ['default']
246246
include:
247-
- os: 'windows-2019'
248-
# clang build fails on Windows 2022
249-
build_type: Release
247+
# clang-cl works well with Ninja, Debug build
248+
# For VS generator it produces build errors not related to UMF
249+
- os: 'windows-2025'
250+
build_type: Debug
250251
compiler: {c: clang-cl, cxx: clang-cl}
252+
extra_build_options: '-G Ninja'
251253
shared_library: 'ON'
252254
level_zero_provider: 'ON'
253255
cuda_provider: 'ON'
254-
toolset: "-T ClangCL"
255-
cmake_ver: '3.14.0-win64-x64'
256-
- os: 'windows-2022'
256+
cmake_ver: 'default'
257+
# Custom CMake and umfd enabled
258+
- os: 'windows-2025'
257259
build_type: Release
258260
compiler: {c: cl, cxx: cl}
259261
shared_library: 'ON'
260262
level_zero_provider: 'ON'
261263
cuda_provider: 'ON'
262264
umfd_lib: 'ON'
263265
cmake_ver: '3.28.0-windows-x86_64'
264-
- os: 'windows-2022'
266+
# Custom, old CMake in a selected build
267+
- os: 'windows-2025'
268+
build_type: Release
269+
compiler: {c: cl, cxx: cl}
270+
shared_library: 'ON'
271+
level_zero_provider: 'ON'
272+
cuda_provider: 'ON'
273+
cmake_ver: '3.14.0-win64-x64'
274+
# L0/CUDA providers disabled
275+
- os: 'windows-2025'
265276
build_type: Release
266277
compiler: {c: cl, cxx: cl}
267278
shared_library: 'ON'
@@ -322,7 +333,7 @@ jobs:
322333
run: >
323334
cmake
324335
-B ${{env.BUILD_DIR}}
325-
${{matrix.toolset}}
336+
${{matrix.extra_build_options || ''}}
326337
-DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
327338
-DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
328339
-DCMAKE_C_COMPILER=${{matrix.compiler.c}}
@@ -382,7 +393,7 @@ jobs:
382393
matrix:
383394
build_type: [Release]
384395

385-
runs-on: 'windows-2022'
396+
runs-on: 'windows-latest'
386397

387398
steps:
388399
- name: Checkout
@@ -424,7 +435,7 @@ jobs:
424435
matrix:
425436
build_type: [Release]
426437

427-
runs-on: 'windows-2022'
438+
runs-on: 'windows-latest'
428439

429440
steps:
430441
- name: Checkout
@@ -466,7 +477,7 @@ jobs:
466477
matrix:
467478
build_type: [Release]
468479

469-
runs-on: 'windows-2022'
480+
runs-on: 'windows-latest'
470481

471482
steps:
472483
- 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)