From f77b03c7a2f98bfa6aac400aea6ee7c6734ea2a3 Mon Sep 17 00:00:00 2001
From: Paul Colby <git@colby.id.au>
Date: Sun, 28 Jul 2024 18:37:19 +1000
Subject: [PATCH] Try Qt 6.7.2 and 6.8 on GitHub Actions

---
 .github/workflows/build.yaml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index eafa9f5f8..8721e43d5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -26,7 +26,8 @@ jobs:
         - 6.4.3
         - 6.5.3
         - 6.6.3
-        - 6.7.1
+        - 6.7.2
+        - 6.8.0
         env:
         - { cc: clang, cxx: clang++, coverage: false }
         - { cc: gcc, cxx: g++, coverage: false }
@@ -165,7 +166,8 @@ jobs:
         - 6.4.3
         - 6.5.3
         - 6.6.3
-        - 6.7.1
+        - 6.7.2
+        - 6.8.0
         os: [ 'macos-12', 'macos-13', 'macos-14' ]
         env:
         - { cc: clang, cxx: clang++, coverage: false }
@@ -200,7 +202,8 @@ jobs:
           - { qt: '6.4.3', env: { cc: gcc-12 } }
           - { qt: '6.5.3', env: { cc: gcc-12 } }
           - { qt: '6.6.3', env: { cc: gcc-12 } }
-          - { qt: '6.7.1', env: { cc: gcc-12 } }
+          - { qt: '6.7.2', env: { cc: gcc-12 } }
+          - { qt: '6.8.0', env: { cc: gcc-12 } }
     steps:
     - uses: actions/checkout@v4
     - name: Install lcov
@@ -295,7 +298,8 @@ jobs:
         - 6.4.3
         - 6.5.3
         - 6.6.3
-        - 6.7.1
+        - 6.7.2
+        - 6.8.0
         generator: [ 'MinGW Makefiles', 'NMake Makefiles' ]
         arch: [ x86, x86-64, arm64 ]
         exclude:
@@ -323,7 +327,8 @@ jobs:
         - { arch: x86, qt: '6.4.3' }
         - { arch: x86, qt: '6.5.3' }
         - { arch: x86, qt: '6.6.3' }
-        - { arch: x86, qt: '6.7.1' }
+        - { arch: x86, qt: '6.7.2' }
+        - { arch: x86, qt: '6.8.0' }
         # Exclude MinGW builds for x86-64 with Qt's earlier than 5.12, since the Qt online
         # installer (as used by aqtinstaller) did not include x86-64 binaries until Qt 5.12.
         - { arch: x86-64, qt: '5.9.9',  generator: 'MinGW Makefiles' }
@@ -339,7 +344,8 @@ jobs:
         - { generator: 'MinGW Makefiles', qt: '6.4.3',   qtArch: win64_mingw   }
         - { generator: 'MinGW Makefiles', qt: '6.5.3',   qtArch: win64_mingw   }
         - { generator: 'MinGW Makefiles', qt: '6.6.3',   qtArch: win64_mingw   }
-        - { generator: 'MinGW Makefiles', qt: '6.7.1',   qtArch: win64_mingw   }
+        - { generator: 'MinGW Makefiles', qt: '6.7.2',   qtArch: win64_mingw   }
+        - { generator: 'MinGW Makefiles', qt: '6.8.0',   qtArch: win64_mingw   }
         - { generator: 'NMake Makefiles', arch: x86, qt: '5.9.9',   qtArch: win32_msvc2015 }
         - { generator: 'NMake Makefiles', arch: x86, qt: '5.11.3',  qtArch: win32_msvc2015 }
         - { generator: 'NMake Makefiles', arch: x86, qt: '5.12.12', qtArch: win32_msvc2017 }
@@ -377,7 +383,7 @@ jobs:
         arch: ${{ matrix.qtArch }}
         # Use Qt's shipped MinGW for Qt 6.6+ for now, as the runner's MinGW version crashes with Qt 6.6 and 6.7.
         # \todo Remove this if/when the runner's MinGW is updated to fix the incompatibility.
-        tools: ${{ (startsWith(matrix.qt, '6.6') || startsWith(matrix.qt, '6.7')) && startsWith(matrix.generator, 'MinGW') && 'tools_mingw90' || '' }}
+        tools: ${{ (startsWith(matrix.qt, '6.6') || startsWith(matrix.qt, '6.7' || startsWith(matrix.qt, '6.8' )) && startsWith(matrix.generator, 'MinGW') && 'tools_mingw90' || '' }}
         add-tools-to-path: true
         documentation: true
         doc-archives: ${{ (startsWith(matrix.qt, '5.10.') || startsWith(matrix.qt, '5.11.')) && 'qt' || (startsWith(matrix.qt, '5') && 'qtcore qtbluetooth' || 'qtcore') }}