From 983e3e47a997d38f5abccef41176bc4f69c83d39 Mon Sep 17 00:00:00 2001
From: Nicolas Berthier <nicolas.berthier@ocamlpro.com>
Date: Wed, 21 Aug 2024 09:49:52 +0200
Subject: [PATCH] Use a broader build matrix for Windows' CI

---
 .github/workflows/windows-java.yml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/windows-java.yml b/.github/workflows/windows-java.yml
index 7edb176ed..a27be9be6 100644
--- a/.github/workflows/windows-java.yml
+++ b/.github/workflows/windows-java.yml
@@ -15,20 +15,23 @@ jobs:
       matrix:
         os:
           - windows-latest
-
-    runs-on: ${{ matrix.os }}
+        sys:
+          - mingw64
+          - mingw32
+          - ucrt64
+    runs-on: ${{matrix.os}}
 
     steps:
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{matrix.sys}}
+          pacboy: openssl:p
+          install: autoconf automake libtool make mingw-w64-x86_64-ncurses mingw-w64-x86_64-libxml2 mingw-w64-x86_64-cjson mingw-w64-x86_64-db mingw-w64-x86_64-gmp libdb-devel mingw-w64-x86_64-gcc flex bison gmp-devel help2man texinfo gettext-devel
+
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install packages
-        uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          install: autoconf automake libtool make mingw-w64-x86_64-ncurses mingw-w64-x86_64-libxml2 mingw-w64-x86_64-cjson mingw-w64-x86_64-db mingw-w64-x86_64-gmp libdb-devel mingw-w64-x86_64-gcc flex bison gmp-devel help2man texinfo gettext-devel
-
       - name: Set git user
         run: |
           git config --global user.name github-actions
@@ -68,7 +71,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: config-${{ matrix.os }}.log
+          name: config-${{matrix.sys}}.log
           path: _build/config.log
 
       - name: make
@@ -89,7 +92,7 @@ jobs:
       - name: Upload testsuite.log
         uses: actions/upload-artifact@v4
         with:
-          name: testsuite-${{ matrix.os }}.log
+          name: testsuite-${{matrix.sys}}.log
           path: _build/tests/testsuite.log
 
       - name: install
@@ -101,5 +104,5 @@ jobs:
       - name: Upload install.log
         uses: actions/upload-artifact@v4
         with:
-          name: install-${{ matrix.os }}.log
+          name: install-${{matrix.sys}}.log
           path: _build/install.log