From 2ba9025f281028be492ec73931eb67fb035c5670 Mon Sep 17 00:00:00 2001
From: Paul Colby <git@colby.id.au>
Date: Tue, 7 Jan 2025 22:09:27 +1100
Subject: [PATCH] Try the Qt 6.7+ LLVM builds on Windows

---
 .github/workflows/build.yaml | 178 ++++++++++++++++++-----------------
 1 file changed, 90 insertions(+), 88 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8e4d47f0e..77d95b96e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -7,6 +7,7 @@ permissions:
 
 jobs:
   linux:
+    if: false
     runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
@@ -149,6 +150,7 @@ jobs:
           if-no-files-found: error
 
   mac:
+    if: false
     runs-on: ${{ matrix.os }}
     timeout-minutes: 15
     strategy:
@@ -340,23 +342,23 @@ jobs:
       fail-fast: false
       matrix:
         qt:
-          - 5.9.9
-          - 5.10.1
-          - 5.11.3
-          - 5.12.12
-          - 5.13.2
-          - 5.14.2
-          - 5.15.2
-          - 6.2.4
-          - 6.3.2
-          - 6.4.3
-          - 6.5.3
-          - 6.6.3
+          #- 5.9.9
+          #- 5.10.1
+          #- 5.11.3
+          #- 5.12.12
+          #- 5.13.2
+          #- 5.14.2
+          #- 5.15.2
+          #- 6.2.4
+          #- 6.3.2
+          #- 6.4.3
+          #- 6.5.3
+          #- 6.6.3
           - 6.7.3
           - 6.8.1
           - 6.9.0
         arch: [ x86, x86-64, arm64 ]
-        toolchain: [ llvm, mingw, msvc ]
+        toolchain: [ llvm ] #, mingw, msvc ]
         exclude:
           # Exclude arm64 builds for Qt's earlier than 6.2, since Qt only added (Windows) arm64
           # 'Technology Preview' support in 6.2.
@@ -410,84 +412,84 @@ jobs:
           - { toolchain: llvm, qt: '6.9.0' }
         include:
           # Map the aqtinstall (aqt) architectures.
-          - { qt: '5.9.9',   toolchain: mingw, arch: x86,    aqtArch: win32_mingw53 }
-          - { qt: '5.9.9',   toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2015 }
-          - { qt: '5.9.9',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2013_64 }
-          - { qt: '5.9.9',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
-          - { qt: '5.9.9',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2017_64 }
-          - { qt: '5.10.1',  toolchain: mingw, arch: x86,    aqtArch: win32_mingw53 }
-          # { qt: '5.10.1',  toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2015 } # Excluded above (QTBUG-67259).
-          - { qt: '5.10.1',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2013_64 }
-          - { qt: '5.10.1',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
-          - { qt: '5.10.1',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2017_64 }
-          - { qt: '5.11.3',  toolchain: mingw, arch: x86,    aqtArch: win32_mingw53 }
-          - { qt: '5.11.3',  toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2015 }
-          - { qt: '5.11.3',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
-          - { qt: '5.11.3',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2017_64 }
-          - { qt: '5.12.12', toolchain: mingw, arch: x86,    aqtArch: win32_mingw73 }
-          - { qt: '5.12.12', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw73 }
-          - { qt: '5.12.12', toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2017 }
-          - { qt: '5.12.12', toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
-          - { qt: '5.12.12', toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2017_64 }
-          - { qt: '5.13.2',  toolchain: mingw, arch: x86,    aqtArch: win32_mingw73 }
-          - { qt: '5.13.2',  toolchain: mingw, arch: x86-64, aqtArch: win64_mingw73 }
-          - { qt: '5.13.2',  toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2017 }
-          - { qt: '5.13.2',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
-          - { qt: '5.13.2',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2017_64 }
-          - { qt: '5.14.2',  toolchain: mingw, arch: x86,    aqtArch: win32_mingw73 }
-          - { qt: '5.14.2',  toolchain: mingw, arch: x86-64, aqtArch: win64_mingw73 }
-          - { qt: '5.14.2',  toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2017 }
-          - { qt: '5.14.2',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
-          - { qt: '5.14.2',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2017_64 }
-          - { qt: '5.15.2',  toolchain: mingw, arch: x86,    aqtArch: win32_mingw81 }
-          - { qt: '5.15.2',  toolchain: mingw, arch: x86-64, aqtArch: win64_mingw81 }
-          - { qt: '5.15.2',  toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2019 }
-          - { qt: '5.15.2',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
-          - { qt: '5.15.2',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
-          - { qt: '6.2.4',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
-          - { qt: '6.2.4',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
-          - { qt: '6.2.4',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
-          - { qt: '6.3.2',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
-          - { qt: '6.3.2',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
-          - { qt: '6.3.2',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
-          - { qt: '6.4.3',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
-          - { qt: '6.4.3',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
-          - { qt: '6.4.3',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
-          - { qt: '6.5.3',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
-          - { qt: '6.5.3',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
-          - { qt: '6.5.3',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
-          - { qt: '6.6.3',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
-          - { qt: '6.6.3',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
-          - { qt: '6.6.3',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
-          # { qt: '6.7.3',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw } \todo See temp exclusion above.
-          - { qt: '6.7.3',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
-          - { qt: '6.7.3',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
-          - { qt: '6.7.3',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
-          # { qt: '6.8.1',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw } \todo See temp exclusion above.
-          - { qt: '6.8.1',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
-          - { qt: '6.8.1',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2022_arm64_cross_compiled }
-          - { qt: '6.8.1',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2022_64 }
-          # { qt: '6.9.0',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw } \todo See temp exclusion above.
-          - { qt: '6.9.0',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
-          - { qt: '6.9.0',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2022_arm64_cross_compiled }
-          - { qt: '6.9.0',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2022_64 }
+          #- { qt: '5.9.9',   toolchain: mingw, arch: x86,    aqtArch: win32_mingw53 }
+          #- { qt: '5.9.9',   toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2015 }
+          #- { qt: '5.9.9',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2013_64 }
+          #- { qt: '5.9.9',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
+          #- { qt: '5.9.9',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2017_64 }
+          #- { qt: '5.10.1',  toolchain: mingw, arch: x86,    aqtArch: win32_mingw53 }
+          ## { qt: '5.10.1',  toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2015 } # Excluded above (QTBUG-67259).
+          #- { qt: '5.10.1',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2013_64 }
+          #- { qt: '5.10.1',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
+          #- { qt: '5.10.1',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2017_64 }
+          #- { qt: '5.11.3',  toolchain: mingw, arch: x86,    aqtArch: win32_mingw53 }
+          #- { qt: '5.11.3',  toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2015 }
+          #- { qt: '5.11.3',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
+          #- { qt: '5.11.3',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2017_64 }
+          #- { qt: '5.12.12', toolchain: mingw, arch: x86,    aqtArch: win32_mingw73 }
+          #- { qt: '5.12.12', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw73 }
+          #- { qt: '5.12.12', toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2017 }
+          #- { qt: '5.12.12', toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
+          #- { qt: '5.12.12', toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2017_64 }
+          #- { qt: '5.13.2',  toolchain: mingw, arch: x86,    aqtArch: win32_mingw73 }
+          #- { qt: '5.13.2',  toolchain: mingw, arch: x86-64, aqtArch: win64_mingw73 }
+          #- { qt: '5.13.2',  toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2017 }
+          #- { qt: '5.13.2',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
+          #- { qt: '5.13.2',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2017_64 }
+          #- { qt: '5.14.2',  toolchain: mingw, arch: x86,    aqtArch: win32_mingw73 }
+          #- { qt: '5.14.2',  toolchain: mingw, arch: x86-64, aqtArch: win64_mingw73 }
+          #- { qt: '5.14.2',  toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2017 }
+          #- { qt: '5.14.2',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
+          #- { qt: '5.14.2',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2017_64 }
+          #- { qt: '5.15.2',  toolchain: mingw, arch: x86,    aqtArch: win32_mingw81 }
+          #- { qt: '5.15.2',  toolchain: mingw, arch: x86-64, aqtArch: win64_mingw81 }
+          #- { qt: '5.15.2',  toolchain: msvc,  arch: x86,    aqtArch: win32_msvc2019 }
+          #- { qt: '5.15.2',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2015_64 }
+          #- { qt: '5.15.2',  toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
+          #- { qt: '6.2.4',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
+          #- { qt: '6.2.4',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
+          #- { qt: '6.2.4',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
+          #- { qt: '6.3.2',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
+          #- { qt: '6.3.2',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
+          #- { qt: '6.3.2',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
+          #- { qt: '6.4.3',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
+          #- { qt: '6.4.3',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
+          #- { qt: '6.4.3',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
+          #- { qt: '6.5.3',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
+          #- { qt: '6.5.3',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
+          #- { qt: '6.5.3',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
+          #- { qt: '6.6.3',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
+          #- { qt: '6.6.3',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
+          #- { qt: '6.6.3',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
+          - { qt: '6.7.3',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw }
+          #- { qt: '6.7.3',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
+          #- { qt: '6.7.3',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2019_arm64 }
+          #- { qt: '6.7.3',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
+          - { qt: '6.8.1',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw }
+          #- { qt: '6.8.1',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
+          #- { qt: '6.8.1',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2022_arm64_cross_compiled }
+          #- { qt: '6.8.1',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2022_64 }
+          - { qt: '6.9.0',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw }
+          #- { qt: '6.9.0',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
+          #- { qt: '6.9.0',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2022_arm64_cross_compiled }
+          #- { qt: '6.9.0',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2022_64 }
           # Map the MSVC architecture.
-          - { toolchain: msvc, arch: arm64,  msvcArch: amd64_arm64 }
-          - { toolchain: msvc, arch: x86,    msvcArch: amd64_x86 }
-          - { toolchain: msvc, arch: x86-64, msvcArch: amd64 }
+          #- { toolchain: msvc, arch: arm64,  msvcArch: amd64_arm64 }
+          #- { toolchain: msvc, arch: x86,    msvcArch: amd64_x86 }
+          #- { toolchain: msvc, arch: x86-64, msvcArch: amd64 }
           # Define the generator and dll names per toolchain.
-          # { toolchain: 'llvm',  generator: 'MinGW Makefiles', dll: libQtPokit.dll } \todo See temp exclusion above.
-          - { toolchain: 'mingw', generator: 'MinGW Makefiles', dll: libQtPokit.dll }
-          - { toolchain: 'msvc',  generator: 'NMake Makefiles', dll: QtPokit.dll }
+          - { toolchain: 'llvm',  generator: 'MinGW Makefiles', dll: libQtPokit.dll }
+          #- { toolchain: 'mingw', generator: 'MinGW Makefiles', dll: libQtPokit.dll }
+          #- { toolchain: 'msvc',  generator: 'NMake Makefiles', dll: QtPokit.dll }
           # Use Qt-provided 64-bit MinGW for recent Qt's (defaulting to GitHub's 12.2.0 version for older Qt versions).
-          - { toolchain: 'mingw', arch: x86-64, qt: '5.14.2', aqtTools: 'tools_mingw1310' }
-          - { toolchain: 'mingw', arch: x86-64, qt: '5.15.2', aqtTools: 'tools_mingw1310' }
-          - { toolchain: 'mingw', arch: x86-64, qt: '6.4.3',  aqtTools: 'tools_mingw1310' }
-          - { toolchain: 'mingw', arch: x86-64, qt: '6.5.3',  aqtTools: 'tools_mingw1310' }
-          - { toolchain: 'mingw', arch: x86-64, qt: '6.6.3',  aqtTools: 'tools_mingw1310' }
-          - { toolchain: 'mingw', arch: x86-64, qt: '6.7.3',  aqtTools: 'tools_mingw1310' }
-          - { toolchain: 'mingw', arch: x86-64, qt: '6.8.1',  aqtTools: 'tools_mingw1310' }
-          - { toolchain: 'mingw', arch: x86-64, qt: '6.9.0',  aqtTools: 'tools_mingw1310' }
+          #- { toolchain: 'mingw', arch: x86-64, qt: '5.14.2', aqtTools: 'tools_mingw1310' }
+          #- { toolchain: 'mingw', arch: x86-64, qt: '5.15.2', aqtTools: 'tools_mingw1310' }
+          #- { toolchain: 'mingw', arch: x86-64, qt: '6.4.3',  aqtTools: 'tools_mingw1310' }
+          #- { toolchain: 'mingw', arch: x86-64, qt: '6.5.3',  aqtTools: 'tools_mingw1310' }
+          #- { toolchain: 'mingw', arch: x86-64, qt: '6.6.3',  aqtTools: 'tools_mingw1310' }
+          #- { toolchain: 'mingw', arch: x86-64, qt: '6.7.3',  aqtTools: 'tools_mingw1310' }
+          #- { toolchain: 'mingw', arch: x86-64, qt: '6.8.1',  aqtTools: 'tools_mingw1310' }
+          #- { toolchain: 'mingw', arch: x86-64, qt: '6.9.0',  aqtTools: 'tools_mingw1310' }
     steps:
       - name: Configure path
         if: matrix.toolchain != 'msvc'