Skip to content

Commit

Permalink
Set the arch explicity for Qt 6.8.0 on Windows for now
Browse files Browse the repository at this point in the history
Since install-qt-action still defaults to the previous (now
incorrect) arch.

See jurplel/install-qt-action#250
  • Loading branch information
pcolby committed Aug 4, 2024
1 parent 648b0c7 commit 01e7062
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }
Expand Down

0 comments on commit 01e7062

Please sign in to comment.