Update build-win-mingw.yml

shdwmtr · Jul 6, 2024 · 19f7450 · 19f7450
1 parent a9ea494
commit 19f7450
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/.github/workflows/build-win-mingw.yml b/.github/workflows/build-win-mingw.yml
@@ -18,9 +18,15 @@ jobs:
         VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
     strategy:
+      fail-fast: false
       matrix:
         include:
-          - { sys: mingw32, env: i686 }
+          - sys: mingw64
+            env: x86_64
+          - sys: mingw32
+            env: i686
+          - sys: ucrt64
+            env: ucrt-x86_64
 
     steps:
 
@@ -109,24 +115,21 @@ jobs:
         name: python 3.11.8 build libraries
         path: D:/a/Millennium/Millennium/build/python
 
-    - name: Install MinGW
+    - name: Install prerequisites
       uses: msys2/setup-msys2@v2
       with:
-        update: true
-        msystem: MINGW32
+        msystem: ${{ matrix.sys }}
         install: >-
-          mingw-w64-i686-toolchain
-          mingw-w64-i686-cmake
-          mingw-w64-i686-gcc
-    - shell: msys2 {0}
-      run: |
-        whereis gcc
-        whereis g++
-        whereis cmake
-            
-    - name: Add MinGW32 to PATH
-      run: |
-        echo "::add-path::D:/a/_temp/msys64/mingw32/bin"
+          mingw-w64-${{ matrix.env }}-libgcrypt
+          mingw-w64-${{ matrix.env }}-gcc
+          mingw-w64-${{ matrix.env }}-cmake
+          mingw-w64-${{ matrix.env }}-ninja
+          mingw-w64-${{ matrix.env }}-doxygen
+          mingw-w64-${{ matrix.env }}-graphviz
+          mingw-w64-${{ matrix.env }}-ghostscript
+          mingw-w64-${{ matrix.env }}-texlive-bin
+          diffutils
+          groff
 
     - name: (Dependency) Install vcpkg
       shell: pwsh
@@ -137,10 +140,7 @@ jobs:
         ./vendor/vcpkg/vcpkg integrate install
 
     - name: (Generator) Configure CMake
-      shell: msys2 {0}
       run: |
-        export PATH=/mingw64/bin:$PATH
-        export MSYSTEM=MINGW32
         cmake --preset=windows-mingw-release -DGITHUB_ACTION_BUILD=ON
 
     - name: Build Millennium