From b279f7f6fca676554bf6845d97e0c2a8847caca8 Mon Sep 17 00:00:00 2001
From: andy5995 <arch_stanton5995@proton.me>
Date: Tue, 12 Nov 2024 14:49:06 -0600
Subject: [PATCH] Add msys2 and mingw to windows workflow

---
 .github/workflows/windows.yml | 115 +++++++++++++++++++++++-----------
 1 file changed, 78 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 57c5103..27bc51b 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -62,41 +62,82 @@ jobs:
         run: |
           meson test -C builddir || cat builddir\meson-logs\testlog.txt
 
-  #MSYS2:
-      #runs-on: windows-latest
-      #strategy:
-        #fail-fast: false
-        #matrix:
-          #platform: ['UCRT64', 'CLANG64']
-      #steps:
-        #- uses: actions/checkout@v4
-          #with:
-            #fetch-depth: 0
-
-        #- uses: msys2/setup-msys2@v2
-          #with:
-            #msystem: ${{matrix.platform}}
-            #install: >-
-              #bison
-              #dos2unix
-              #git
-            #pacboy: >-
-              #cc:p
-              #cmake:p
-              #ninja:p
-              #pkgconf:p
-              #python-certifi:p
-              #python-pip:p
-            ## Make sure Python is updated to >=3.11 (fix https://github.com/msys2/MINGW-packages/issues/17415).
-            #update: true
-
-        #- name: Install packages
-          #shell: msys2 {0}
-          #run: |
-            #python -m pip install --pre meson
-
-        #- name: Sanity Checks
-          #shell: msys2 {0}
-          #run: |
-            #python tools/sanity_checks.py
+  MSYS2:
+      runs-on: windows-latest
+      strategy:
+        fail-fast: false
+        matrix:
+          platform: ['UCRT64', 'CLANG64']
+      steps:
+        - uses: actions/checkout@v4
 
+        - uses: msys2/setup-msys2@v2
+          with:
+            msystem: ${{matrix.platform}}
+            install: >-
+              bison
+              dos2unix
+              git
+            pacboy: >-
+              cc:p
+              cmake:p
+              ninja:p
+              pkgconf:p
+              python-certifi:p
+              python-pip:p
+            # Make sure Python is updated to >=3.11 (fix https://github.com/msys2/MINGW-packages/issues/17415).
+            update: true
+
+        - name: Install packages
+          shell: msys2 {0}
+          run: |
+            python -m pip install --pre meson
+
+        - name: Configure
+          run: meson setup builddir -Ddefault_library=static -Db_sanitize=none
+
+        - name: Build
+          run: meson compile -C builddir
+
+        - name: Test
+          run: |
+            meson test -C builddir || cat builddir\meson-logs\testlog.txt
+
+
+  mingw:
+    name: ${{ matrix.build.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        build:
+          - os: windows-latest
+    runs-on: ${{ matrix.build.os }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Show info
+        run: |
+          echo '${{ toJSON(matrix) }}'
+
+      #- name: Setup Python
+        #uses: actions/setup-python@v5
+        #with:
+          #python-version: '3.x'
+
+      - name: Install Meson
+        run: python -m pip install --pre meson
+
+      - name: Install MinGW
+        uses: egor-tensin/setup-mingw@v2
+        with:
+          version: 12.2.0
+
+      - name: Configure
+        run: meson setup builddir -Ddefault_library=static -Db_sanitize=none
+
+      - name: Build
+        run: meson compile -C builddir
+
+      - name: Test
+        run: |
+          meson test -C builddir || cat builddir\meson-logs\testlog.txt