CI-mingw.yml: use pre-installed MinGW/MSYS2

firewave · firewave · commit fe5ea3fdde53 · 2022-09-25T22:05:02.000+02:00
diff --git a/.github/workflows/CI-mingw.yml b/.github/workflows/CI-mingw.yml
@@ -11,27 +11,29 @@ permissions:
 
 defaults:
   run:
-    shell: cmd
+    shell: msys2 {0}
 
 jobs:
   build_mingw:
     strategy:
       matrix:
-        os: [windows-2019] # fails to download with "windows-2022"
-        arch: [x64] # TODO: fix x86 build?
+        # the MinGW installation in windows-2019 is supposed to be 8.1 but it is 12.2
+        # the MinGW installation in windows-2022 is not including all necessary packages by default so use the older one instead
+        # TODO: add 32-bit build?
+        os: [windows-2019]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up MinGW
-        uses: egor-tensin/setup-mingw@v2
+      - name: Set up MSYS2
+        uses: msys2/setup-msys2@v2
         with:
-          platform: ${{ matrix.arch }}
+          release: false # use pre-installed
 
       # MinGW will always link the binaries even if they already exist. The linking is also extremely slow. So just run the "check" target which includes all the binaries.
       - name: Build all and run test
         run: |
-          mingw32-make VERBOSE=1 -j2 check
+          make VERBOSE=1 RDYNAMIC=-lshlwapi -j2 check
