From cdd78f1ab35e70c0c3c338fa05dc0a1ad2041cf8 Mon Sep 17 00:00:00 2001
From: slaren <slarengh@gmail.com>
Date: Sun, 1 Dec 2024 22:25:03 +0100
Subject: [PATCH] wip4

---
 .github/workflows/build.yml | 39 +++++++------------------------------
 1 file changed, 7 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e4599c85181dee..ad2a87e9ef1548 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,7 +41,6 @@ jobs:
       matrix:
         arch: [avx, avx2, avx512, amx]
         include:
-          - { sys: UCRT64, env: ucrt-x86_64, build: Release }
           - { arch: avx,    defines: '-DGGML_AVX=ON -DGGML_AVX2=OFF -DGGML_AVX512=OFF -DGGML_AMX_TILE=OFF -DGGML_AMX_INT8=OFF' }
           - { arch: avx2,   defines: '-DGGML_AVX=ON -DGGML_AVX2=ON  -DGGML_AVX512=OFF -DGGML_AMX_TILE=OFF -DGGML_AMX_INT8=OFF' }
           - { arch: avx512, defines: '-DGGML_AVX=ON -DGGML_AVX2=ON  -DGGML_AVX512=ON  -DGGML_AMX_TILE=OFF -DGGML_AMX_INT8=OFF' }
@@ -51,19 +50,11 @@ jobs:
       - name: Clone
         uses: actions/checkout@v4
 
-      - name: Setup ${{ matrix.sys }}
-        uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          msystem: ${{matrix.sys}}
-          install: >-
-            base-devel
-            mingw-w64-${{matrix.env}}-toolchain
-            mingw-w64-${{matrix.env}}-cmake
-            mingw-w64-${{matrix.env}}-ninja
+      - name: Install Ninja
+        run: |
+          choco install ninja
 
       - name: Build using CMake
-        shell: msys2 {0}
         run: |
             cmake -B build -G "Ninja Multi-Config" -DGGML_NATIVE=OFF -DBUILD_SHARED_LIBS=ON -DGGML_BACKEND_DL=ON ${{ matrix.defines }}
             cmake --build build --config ${{ matrix.build }} -t ggml-cpu
@@ -84,35 +75,19 @@ jobs:
     needs:
       - windows-msys2-cpu-x86_64
 
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { sys: UCRT64, env: ucrt-x86_64, build: Release }
-
     steps:
       - name: Clone
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup ${{ matrix.sys }}
-        uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          msystem: ${{matrix.sys}}
-          install: >-
-            base-devel
-            git
-            mingw-w64-${{matrix.env}}-toolchain
-            mingw-w64-${{matrix.env}}-cmake
-            mingw-w64-${{matrix.env}}-ninja
-            mingw-w64-${{matrix.env}}-curl
+      - name: Install Ninja
+        run: |
+          choco install ninja
 
       - name: Build using CMake
-        shell: msys2 {0}
         run: |
-            cmake -B build -G "Ninja Multi-Config" -DLLAMA_CURL=ON -DLLAMA_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DGGML_BACKEND_DL=ON
+            cmake -B build -G "Ninja Multi-Config" -DLLAMA_CURL=ON -DLLAMA_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DGGML_BACKEND_DL=ON -DCMAKE_
             cmake --build build --config ${{ matrix.build }}
             rm build/bin/Release/ggml-cpu.dll