From 8b5acb8d8bdb10192494267e064eb91018e3897b Mon Sep 17 00:00:00 2001
From: Egor Tensin <egor@tensin.name>
Date: Mon, 12 Jan 2026 19:54:15 +0100
Subject: workflows/ci: include Windows 2022 as well

---
 .github/workflows/ci.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 60fcbc2..50f5bb8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,19 +21,20 @@ jobs:
   build:
     strategy:
       matrix:
-        toolset: [mingw, vs2022]
+        os: [ubuntu-latest, windows-2022, windows-2025]
         platform: [x64, x86]
         configuration: [Debug, RelWithDebInfo]
         include:
           - boost-version: 1.81.0
           # MinGW builds are done on Linux, since it's more up-to-date there,
           # and it's much faster.
-          - {toolset: mingw,  os: ubuntu-latest}
-          # At the moment, windows-2022 & windows-2025 both provide VS 2022, so
-          # there's no difference between the two.
-          - {toolset: vs2022, os: windows-2025}
+          - {os: ubuntu-latest, toolset: mingw}
+          - {os: windows-2022, toolset: vs2022}
+          # At the moment, the 2025 image still has VS 2022.
+          - {os: windows-2025, toolset: vs2022}
+
     runs-on: '${{ matrix.os }}'
-    name: 'Build: ${{ matrix.toolset }} / ${{ matrix.platform }} / ${{ matrix.configuration }}'
+    name: 'Build: ${{ matrix.os }} / ${{ matrix.platform }} / ${{ matrix.configuration }}'
     defaults:
       run:
         shell: pwsh
@@ -68,7 +69,7 @@ jobs:
       - name: Upload binaries
         uses: actions/upload-artifact@v6
         with:
-          name: 'winapi-debug-${{ matrix.toolset }}-${{ matrix.platform }}-${{ matrix.configuration }}'
+          name: 'winapi-debug-${{ matrix.os }}-${{ matrix.platform }}-${{ matrix.configuration }}'
           path: './build/install/'
           if-no-files-found: error
       - name: Test
-- 
cgit v1.3