@@ -235,33 +235,37 @@ jobs:
235
235
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"
236
236
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"
237
237
strategy :
238
+ # TODO: add '3.14.0-win64-x64' CMake testing
238
239
matrix :
239
- os : ['windows-2019 ', 'windows-2022 ']
240
+ os : ['windows-2022 ', 'windows-2025 ']
240
241
build_type : [Debug, Release]
241
242
compiler : [{c: cl, cxx: cl}]
242
243
shared_library : ['ON', 'OFF']
243
244
level_zero_provider : ['ON']
244
245
cuda_provider : ['ON']
245
246
cmake_ver : ['default']
246
247
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
250
252
compiler : {c: clang-cl, cxx: clang-cl}
253
+ extra_build_options : ' -G Ninja'
251
254
shared_library : ' ON'
252
255
level_zero_provider : ' ON'
253
256
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 '
257
260
build_type : Release
258
261
compiler : {c: cl, cxx: cl}
259
262
shared_library : ' ON'
260
263
level_zero_provider : ' ON'
261
264
cuda_provider : ' ON'
262
265
umfd_lib : ' ON'
263
266
cmake_ver : ' 3.28.0-windows-x86_64'
264
- - os : ' windows-2022'
267
+ # L0/CUDA providers disabled
268
+ - os : ' windows-2025'
265
269
build_type : Release
266
270
compiler : {c: cl, cxx: cl}
267
271
shared_library : ' ON'
@@ -322,7 +326,7 @@ jobs:
322
326
run : >
323
327
cmake
324
328
-B ${{env.BUILD_DIR}}
325
- ${{matrix.toolset }}
329
+ ${{matrix.extra_build_options || '' }}
326
330
-DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
327
331
-DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
328
332
-DCMAKE_C_COMPILER=${{matrix.compiler.c}}
@@ -382,7 +386,7 @@ jobs:
382
386
matrix :
383
387
build_type : [Release]
384
388
385
- runs-on : ' windows-2022 '
389
+ runs-on : ' windows-latest '
386
390
387
391
steps :
388
392
- name : Checkout
@@ -424,7 +428,7 @@ jobs:
424
428
matrix :
425
429
build_type : [Release]
426
430
427
- runs-on : ' windows-2022 '
431
+ runs-on : ' windows-latest '
428
432
429
433
steps :
430
434
- name : Checkout
@@ -466,7 +470,7 @@ jobs:
466
470
matrix :
467
471
build_type : [Release]
468
472
469
- runs-on : ' windows-2022 '
473
+ runs-on : ' windows-latest '
470
474
471
475
steps :
472
476
- name : Checkout
0 commit comments