@@ -664,7 +664,7 @@ jobs:
664664 ./build-xcframework.sh
665665
666666 windows-msys2 :
667- runs-on : windows-latest
667+ runs-on : windows-2025
668668
669669 strategy :
670670 fail-fast : false
@@ -714,7 +714,7 @@ jobs:
714714 cmake --build build --config ${{ matrix.build }} -j $(nproc)
715715
716716 windows-latest-cmake :
717- runs-on : windows-latest
717+ runs-on : windows-2025
718718
719719 env :
720720 OPENBLAS_VERSION : 0.3.23
@@ -725,16 +725,22 @@ jobs:
725725 matrix :
726726 include :
727727 - build : ' cpu-x64 (static)'
728+ arch : ' x64'
728729 defines : ' -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DBUILD_SHARED_LIBS=OFF'
729730 - build : ' openblas-x64'
731+ arch : ' x64'
730732 defines : ' -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_OPENMP=OFF -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS -DBLAS_INCLUDE_DIRS="$env:RUNNER_TEMP/openblas/include" -DBLAS_LIBRARIES="$env:RUNNER_TEMP/openblas/lib/openblas.lib"'
731733 - build : ' vulkan-x64'
734+ arch : ' x64'
732735 defines : ' -DCMAKE_BUILD_TYPE=Release -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_VULKAN=ON'
733736 - build : ' llvm-arm64'
737+ arch : ' arm64'
734738 defines : ' -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON'
735739 - build : ' llvm-arm64-opencl-adreno'
740+ arch : ' arm64'
736741 defines : ' -G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake -DCMAKE_PREFIX_PATH="$env:RUNNER_TEMP/opencl-arm64-release" -DGGML_OPENCL=ON -DGGML_OPENCL_USE_ADRENO_KERNELS=ON'
737742 # - build: 'kompute-x64'
743+ # arch: 'x64'
738744 # defines: '-G "Ninja Multi-Config" -D CMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake -DGGML_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DGGML_RPC=ON -DGGML_BACKEND_DL=ON -DGGML_CPU_ALL_VARIANTS=ON -DGGML_OPENMP=OFF -DGGML_KOMPUTE=ON -DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON'
739745
740746 steps :
@@ -805,6 +811,8 @@ jobs:
805811 - name : libCURL
806812 id : get_libcurl
807813 uses : ./.github/actions/windows-setup-curl
814+ with :
815+ architecture : ${{ matrix.arch == 'x64' && 'win64' || 'win64a' }}
808816
809817 - name : Build
810818 id : cmake_build
@@ -825,7 +833,7 @@ jobs:
825833
826834 - name : Test
827835 id : cmake_test
828- if : ${{ matrix.build != 'llvm-arm64' && matrix.build ! = 'llvm-arm64-opencl-adreno ' }}
836+ if : ${{ matrix.arch = = 'x64 ' }}
829837 run : |
830838 cd build
831839 ctest -L main -C Release --verbose --timeout 900
@@ -930,7 +938,7 @@ jobs:
930938 cmake --build build --config Release
931939
932940 windows-latest-cmake-sycl :
933- runs-on : windows-latest
941+ runs-on : windows-2022
934942
935943 defaults :
936944 run :
@@ -964,7 +972,7 @@ jobs:
964972
965973 windows-latest-cmake-hip :
966974 if : ${{ github.event.inputs.create_release != 'true' }}
967- runs-on : windows-latest
975+ runs-on : windows-2022
968976
969977 steps :
970978 - name : Clone
0 commit comments