From a3938d5e194474a5a5d472dccb16a2e3b5530c45 Mon Sep 17 00:00:00 2001
From: BagelSketches <112355083+BagelSketches@users.noreply.github.com>
Date: Fri, 4 Jul 2025 13:48:23 +1000
Subject: [PATCH] Update ci.yml

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 151d976c..97b338c8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,10 +35,10 @@ jobs:
       matrix:
         include:
           - { name: 'Linux',          os: 'ubuntu-latest',  dx5: false, config: true,  linux: true, werror: true,   clang-tidy: true }
-          - { name: 'MSVC (x86)',     os: 'windows-latest', dx5: true,  config: true, msvc: true,  werror: false,  clang-tidy: false,  vc-arch: 'amd64_x86' }
+          - { name: 'MSVC (x86)',     os: 'windows-latest', dx5: true,  config: false, msvc: true,  werror: false,  clang-tidy: false,  vc-arch: 'amd64_x86' }
           - { name: 'MSVC (x64)',     os: 'windows-latest', dx5: false, config: true, msvc: true,  werror: false,  clang-tidy: false,  vc-arch: 'amd64' }
-          - { name: 'MSVC (arm64)',   os: 'windows-latest', dx5: false, config: true, msvc: true,  werror: false,  clang-tidy: false,  vc-arch: 'amd64_arm64' }
-          - { name: 'msys2 mingw32',  os: 'windows-latest', dx5: false, config: true, mingw: true, werror: true,   clang-tidy: true,   msystem: 'mingw32', msys-env: 'mingw-w64-i686',   shell: 'msys2 {0}' }
+          - { name: 'MSVC (arm64)',   os: 'windows-latest', dx5: false, config: false, msvc: true,  werror: false,  clang-tidy: false,  vc-arch: 'amd64_arm64' }
+          - { name: 'msys2 mingw32',  os: 'windows-latest', dx5: false, config: false, mingw: true, werror: true,   clang-tidy: true,   msystem: 'mingw32', msys-env: 'mingw-w64-i686',   shell: 'msys2 {0}' }
           - { name: 'msys2 mingw64',  os: 'windows-latest', dx5: false, config: true,  mingw: true, werror: true,   clang-tidy: true,   msystem: 'mingw64', msys-env: 'mingw-w64-x86_64', shell: 'msys2 {0}' }
           - { name: 'macOS',          os: 'macos-latest',   dx5: false, config: true,  brew: true,  werror: true,   clang-tidy: false }
           - { name: 'Emscripten',     os: 'ubuntu-latest',  dx5: false, config: false, emsdk: true, werror: true,   clang-tidy: false,  cmake-wrapper: 'emcmake' }
@@ -62,12 +62,10 @@ jobs:
             ${{ matrix.msys-env }}-clang-tools-extra
             ${{ (matrix.config && format('{0}-qt6-base', matrix.msys-env)) || '' }}
       - name: Install Qt
-        if: ${{ matrix.os == 'windows-latest' && matrix.config }}
+        if: ${{ !!matrix.msvc && matrix.config }}
         uses: jurplel/install-qt-action@v4
         with:
-          cache: 'true'
-          arch: ${{ matrix.vc-arch }}
-          
+          cache: 'true'          
 
       - name: Install Linux dependencies (apt-get)
         if: ${{ matrix.linux }}