From 3bb17ce2d7cc2d2f94f4d2bb9931aae756e394c1 Mon Sep 17 00:00:00 2001
From: Charles Pigott <charlespigott@googlemail.com>
Date: Sun, 5 Apr 2026 09:37:04 +0100
Subject: [PATCH] Codechange: [CI] Use UCRT64 MSYS2 environment (#15422)

* Codechange: [CI] Use UCRT64 MSYS2 environment

* Codechange: [CI] Use pacboy to install packages from the correct subsystem
---
 .github/workflows/ci-mingw.yml   | 19 ++++++++++---------
 .github/workflows/ci-nightly.yml |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-mingw.yml b/.github/workflows/ci-mingw.yml
index dd648d6068..51865c67bd 100644
--- a/.github/workflows/ci-mingw.yml
+++ b/.github/workflows/ci-mingw.yml
@@ -31,15 +31,16 @@ jobs:
         install: >-
           git
           make
-          mingw-w64-${{ inputs.arch }}-cmake
-          mingw-w64-${{ inputs.arch }}-gcc
-          mingw-w64-${{ inputs.arch }}-lzo2
-          mingw-w64-${{ inputs.arch }}-libpng
-          mingw-w64-${{ inputs.arch }}-lld
-          mingw-w64-${{ inputs.arch }}-ninja
-          mingw-w64-${{ inputs.arch }}-libogg
-          mingw-w64-${{ inputs.arch }}-opus
-          mingw-w64-${{ inputs.arch }}-opusfile
+        pacboy: >-
+          cmake:p
+          gcc:p
+          lzo2:p
+          libpng:p
+          lld:p
+          ninja:p
+          libogg:p
+          opus:p
+          opusfile:p
 
     - name: Install OpenGFX
       shell: bash
diff --git a/.github/workflows/ci-nightly.yml b/.github/workflows/ci-nightly.yml
index a05f65a7db..7285759a02 100644
--- a/.github/workflows/ci-nightly.yml
+++ b/.github/workflows/ci-nightly.yml
@@ -31,7 +31,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - msystem: MINGW64
+        - msystem: UCRT64
           arch: x86_64
 
     name: MinGW (${{ matrix.arch }})