Merge pull request #40 from minhqdao/use-matrix-for-msys2

Use matrix to setup `msys2` CI
minhqdao · Aug 2, 2024 · 3e90dd5 · 3e90dd5
2 parents 2e941a9 + 79b87a2
commit 3e90dd5
Showing 1 changed file with 11 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,22 +39,14 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - run: fpm test
 
-  fpm-test-mingw64-gcc:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: mingw64
-          install: >-
-            mingw-w64-x86_64-gcc-fortran
-            mingw-w64-x86_64-fpm
-      - run: fpm test
-
-  fpm-test-ucrt64-gcc:
+  test-msys2:
+    strategy:
+      matrix:
+        include:
+          [
+            { msystem: mingw64, build_variant: "" },
+            { msystem: ucrt64, build_variant: "-ucrt" },
+          ]
     runs-on: windows-latest
     defaults:
       run:
@@ -63,10 +55,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: ucrt64
+          msystem: ${{ matrix.msystem }}
           install: >-
-            mingw-w64-ucrt-x86_64-gcc-fortran
-            mingw-w64-ucrt-x86_64-fpm
+            mingw-w64${{ matrix.build_variant }}-x86_64-gcc-fortran
+            mingw-w64${{ matrix.build_variant }}-x86_64-fpm
       - run: fpm test
 
   make-test: