Skip to content

Commit

Permalink
Try Qt 6.9.0 (currently beta)
Browse files Browse the repository at this point in the history
  • Loading branch information
pcolby committed Dec 26, 2024
1 parent 9e2a846 commit 8571331
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- 6.6.3
- 6.7.3
- 6.8.1
- 6.9.0
cc:
- clang
- gcc
Expand Down Expand Up @@ -163,6 +164,7 @@ jobs:
- 6.6.3
- 6.7.3
- 6.8.1
- 6.9.0
os:
- macos-13
- macos-14
Expand Down Expand Up @@ -197,6 +199,7 @@ jobs:
- { qt: '6.6.3', cc: gcc }
- { qt: '6.7.3', cc: gcc }
- { qt: '6.8.0', cc: gcc } # \todo See if this is still needed.
- { qt: '6.9.0', cc: gcc } # \todo See if this is still needed.
steps:
- uses: actions/checkout@v4
- name: Install lcov
Expand Down Expand Up @@ -341,6 +344,7 @@ jobs:
- 6.6.3
- 6.7.3
- 6.8.1
- 6.9.0
arch: [ x86, x86-64, arm64 ]
toolchain: [ llvm, mingw, msvc ]
exclude:
Expand Down Expand Up @@ -371,6 +375,7 @@ jobs:
- { arch: x86, qt: '6.6.3' }
- { arch: x86, qt: '6.7.3' }
- { arch: x86, qt: '6.8.1' }
- { arch: x86, qt: '6.9.0' }
# Exclude MinGW (including LLVM) 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', toolchain: llvm }
Expand All @@ -395,6 +400,7 @@ jobs:
# \todo Temporarily exclude LLVM builds for Qt 6.7 and 6.8: https://github.com/miurahr/aqtinstall/issues/825
- { toolchain: llvm, qt: '6.7.3' }
- { toolchain: llvm, qt: '6.8.1' }
- { toolchain: llvm, qt: '6.9.0' }
include:
# Map the aqtinstall (aqt) architectures.
- { qt: '5.9.9', toolchain: mingw, arch: x86, aqtArch: win32_mingw53 }
Expand Down Expand Up @@ -453,6 +459,9 @@ jobs:
# { 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: 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: x86-64, aqtArch: win64_msvc2022_64 }
# Map the MSVC architecture.
- { toolchain: msvc, arch: arm64, msvcArch: amd64_arm64 }
- { toolchain: msvc, arch: x86, msvcArch: amd64_x86 }
Expand All @@ -469,6 +478,7 @@ jobs:
- { 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'
Expand Down

0 comments on commit 8571331

Please sign in to comment.