From 18d777fffd0a8d778999eccfc7bd898d628aeedd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Tue, 10 Jun 2025 13:28:53 +0300
Subject: [PATCH] ci: Use pacboy to simplify installation of msys2 packages

See [1] and [2] for reference on using pacboy to simplify installing
mingw packages in msys2. The relevant bit to know is that by
specifying plain package names with a ":p" suffix, in the "pacboy"
section in msys2/setup-msys2, those packages are installed within
the current msys2 environment.

This avoids needing to specify the long package prefix like
"mingw-w64-x86_64". For other environments like "ucrt64", "clang64"
and "clangarm64", the prefix is even longer and less obvious.

[1] https://github.com/msys2/setup-msys2?tab=readme-ov-file#pacboy
[2] https://www.msys2.org/docs/package-naming/#avoiding-writing-long-package-names
---
 .github/workflows/build.yaml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6cc7c16f..f012c24d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -173,11 +173,9 @@ jobs:
       matrix:
         include:
           - sys: mingw64
-            env: x86_64
             compiler: gcc
 
           - sys: mingw64
-            env: x86_64
             compiler: clang
             extra_cmake_params: -DENABLE_TESTING=OFF # clang currently triggers warnings with doctest
 
@@ -195,12 +193,13 @@ jobs:
             git
             diffutils
             tar
-            mingw-w64-${{matrix.env}}-toolchain
-            mingw-w64-${{matrix.env}}-cmake
-            mingw-w64-${{matrix.env}}-ninja
-            mingw-w64-${{matrix.env}}-hiredis
-            mingw-w64-${{matrix.env}}-lld
-            mingw-w64-${{matrix.env}}-${{matrix.compiler}}
+          pacboy: >-
+            toolchain:p
+            cmake:p
+            ninja:p
+            hiredis:p
+            lld:p
+            ${{matrix.compiler}}:p
 
       - name: Set up environment
         run: |
@@ -234,7 +233,7 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.sys}}-${{ matrix.env }}-${{ matrix.compiler }}-testdir.tar.xz
+          name: ${{ matrix.sys }}-${{ matrix.compiler }}-testdir.tar.xz
           path: testdir.tar.xz
 
   build_macos_universal:
-- 
2.47.2