From 01e7062624c0866c9a824dcff1840bb1ea603957 Mon Sep 17 00:00:00 2001 From: Paul Colby Date: Sun, 4 Aug 2024 14:46:07 +1000 Subject: [PATCH] Set the arch explicity for Qt 6.8.0 on Windows for now Since install-qt-action still defaults to the previous (now incorrect) arch. See https://github.com/jurplel/install-qt-action/issues/250 --- .github/workflows/build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fe5e6d2d3..596165ecb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -312,6 +312,7 @@ jobs: - { arch: arm64, qt: '5.13.2' } - { arch: arm64, qt: '5.14.2' } - { arch: arm64, qt: '5.15.2' } + - { arch: arm64, qt: '6.8.0' } # \todo 6.8.0 Beta1 removes cross-compiling to ARM support. # Exclude MinGW builds for arm64, since MinGW has no arm64 support. - { arch: arm64, generator: 'MinGW Makefiles' } # Exclude MinGW builds for x86 (32-bit), since the GitHub Actions Windows runners only @@ -356,6 +357,8 @@ jobs: - { generator: 'NMake Makefiles', arch: arm64, msvcArch: amd64_arm64 } - { generator: 'NMake Makefiles', arch: x86, msvcArch: amd64_x86 } - { generator: 'NMake Makefiles', arch: x86-64, msvcArch: amd64 } + # \todo Remove this one when https://github.com/jurplel/install-qt-action/issues/250 is resovled. + - { generator: 'NMake Makefiles', arch: x86-64, qt: '6.8.0', qtArch: win64_msvc2022_64 } # Define the toolchain and dll names per generator (for artifact naming mostly). - { generator: 'NMake Makefiles', tool: msvc, dll: QtPokit.dll } - { generator: 'MinGW Makefiles', tool: mingw, dll: libQtPokit.dll }