From 71c014962453f10d3d40ee8c6ff10ab517a1fa68 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Fri, 13 Jun 2025 12:15:27 +0300
Subject: [PATCH] Switch MinGW/GCC build from MSYS2 to `windows-2025` image.

---
 .github/workflows/ci.yaml | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bc6b98b77..9b8ba5c3d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -124,24 +124,24 @@ jobs:
         # MinGW/GCC libs using MSVCRT
         - name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_64
           platform: windows
-          os: windows-2019
+          os: windows-2025
           artifact-name: godot-angle-static-x86_64-gcc-release
           artifact-path-angle: bin/libANGLE.windows.x86_64.a
           artifact-path-egl: bin/libEGL.windows.x86_64.a
           artifact-path-gles: bin/libGLES.windows.x86_64.a
-          flags: use_mingw=yes arch=x86_64
+          flags: use_mingw=yes arch=x86_64 mingw_prefix=C:/mingw64
           mingw: yes
           msys: mingw64
           msysenv: x86_64
 
         - name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_32
           platform: windows
-          os: windows-2019
+          os: windows-2025
           artifact-name: godot-angle-static-x86_32-gcc-release
           artifact-path-angle: bin/libANGLE.windows.x86_32.a
           artifact-path-egl: bin/libEGL.windows.x86_32.a
           artifact-path-gles: bin/libGLES.windows.x86_32.a
-          flags: use_mingw=yes arch=x86_32
+          flags: use_mingw=yes arch=x86_32 mingw_prefix=C:/mingw32
           mingw: yes
           msys: mingw32
           msysenv: i686
@@ -165,8 +165,7 @@ jobs:
         if: ${{ matrix.platform == 'macos' || matrix.platform == 'ios' }}
         run: sudo xcode-select -switch "${XCODE_DEV_PATH}"
 
-      - name: Install SCons (Native env)
-        if: ${{ matrix.mingw != 'yes' }}
+      - name: Install SCons
         run: |
           python -m pip install scons==4.0.0
 
@@ -183,27 +182,18 @@ jobs:
           mv llvm-mingw-* "$HOME/llvm-mingw"
           echo "$HOME/llvm-mingw/bin" >> $GITHUB_PATH
 
-      - name: Setup MinGW/MSYS2
+      - name: Setup MinGW path
         if: ${{ matrix.mingw == 'yes' }}
-        uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          msystem: ${{matrix.msys}}
-          install: mingw-w64-${{matrix.msysenv}}-gcc mingw-w64-${{matrix.msysenv}}-scons
+        shell: bash
+        run: |
+          echo "C:/mingw32/bin" >> $GITHUB_PATH
 
       - name: Prepare ANGLE source
         shell: bash
         run: |
           ./update_angle.sh
 
-      - name: Build ANGLE (Native env)
-        if: ${{ matrix.mingw != 'yes' }}
-        run: |
-          scons platform=${{ matrix.platform }} ${{ matrix.flags }} optimize=speed
-
-      - name: Build ANGLE (MSYS2 env)
-        if: ${{ matrix.mingw == 'yes' }}
-        shell: msys2 {0}
+      - name: Build ANGLE
         run: |
           scons platform=${{ matrix.platform }} ${{ matrix.flags }} optimize=speed