From 9b1846e1ab1f871cd0797a5210e89aa74da31433 Mon Sep 17 00:00:00 2001
From: Kbz-8 <kbz_8.code@proton.me>
Date: Sun, 13 Apr 2025 20:59:32 +0200
Subject: [PATCH] yes

---
 .github/workflows/d3d11-test-msys2.yml    | 17 ++++++++++++++---
 .github/workflows/software-test-msys2.yml | 14 ++++++++++++--
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/d3d11-test-msys2.yml b/.github/workflows/d3d11-test-msys2.yml
index 63497e6..7c69d04 100644
--- a/.github/workflows/d3d11-test-msys2.yml
+++ b/.github/workflows/d3d11-test-msys2.yml
@@ -22,14 +22,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, "windows-latest"]
+        msystem: [mingw64]
+        os: [windows-latest]
         arch: [x86_64]
-        confs:
-        - { mode: debug, archive: yes }
+        mode: [debug]
 
     runs-on: ${{ matrix.os }}
     if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
 
+    defaults:
+      run:
+        shell: msys2 {0}
+
     steps:
     - name: Get current date as package key
       id: cache_key
@@ -38,6 +42,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    # Setup MSYS2
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        install: base-devel git unzip p7zip mingw-w64-${{ matrix.arch }}-toolchain mingw-w64-${{ matrix.arch }}-xmake
+        update: true
+
     # Force xmake to a specific folder (for cache)
     - name: Set xmake env
       run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV
diff --git a/.github/workflows/software-test-msys2.yml b/.github/workflows/software-test-msys2.yml
index 0288ee6..c66b79d 100644
--- a/.github/workflows/software-test-msys2.yml
+++ b/.github/workflows/software-test-msys2.yml
@@ -25,12 +25,15 @@ jobs:
         msystem: [mingw64]
         os: [windows-latest]
         arch: [x86_64]
-        confs:
-        - { mode: debug, archive: yes }
+        mode: [debug]
 
     runs-on: ${{ matrix.os }}
     if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
 
+    defaults:
+      run:
+        shell: msys2 {0}
+
     steps:
     - name: Get current date as package key
       id: cache_key
@@ -39,6 +42,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    # Setup MSYS2
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        install: base-devel git unzip p7zip mingw-w64-${{ matrix.arch }}-toolchain mingw-w64-${{ matrix.arch }}-xmake
+        update: true
+
     # Force xmake to a specific folder (for cache)
     - name: Set xmake env
       run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV