@@ -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
0 commit comments