Skip to content

Commit 9dd6856

Browse files
pcolbypcolby
committed
Restore all other build configurations
1 parent 279f81e commit 9dd6856

File tree

1 file changed

+125
-5
lines changed

1 file changed

+125
-5
lines changed

‎.github/workflows/build.yaml

Lines changed: 125 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ permissions:
77

88
jobs:
99
linux:
10-
if: false
1110
runs-on: ubuntu-24.04
1211
strategy:
1312
fail-fast: false
@@ -149,7 +148,6 @@ jobs:
149148
if-no-files-found: error
150149

151150
mac:
152-
if: false
153151
runs-on: ${{ matrix.os }}
154152
timeout-minutes: 15
155153
strategy:
@@ -348,21 +346,143 @@ jobs:
348346
- 5.13.2
349347
- 5.14.2
350348
- 5.15.2
351-
arch: [ x86 ]
352-
toolchain: [ mingw ]
349+
- 6.2.4
350+
- 6.3.2
351+
- 6.4.3
352+
- 6.5.3
353+
- 6.6.3
354+
- 6.7.3
355+
- 6.8.0
356+
arch: [ x86, x86-64, arm64 ]
357+
toolchain: [ llvm, mingw, msvc ]
358+
exclude:
359+
# Exclude arm64 builds for Qt's earlier than 6.2, since Qt only added (Windows) arm64
360+
# 'Technology Preview' support in 6.2.
361+
- { arch: arm64, qt: '5.9.9' }
362+
- { arch: arm64, qt: '5.10.1' }
363+
- { arch: arm64, qt: '5.11.3' }
364+
- { arch: arm64, qt: '5.12.12' }
365+
- { arch: arm64, qt: '5.13.2' }
366+
- { arch: arm64, qt: '5.14.2' }
367+
- { arch: arm64, qt: '5.15.2' }
368+
# Also exclude arm64 for Qt 6.8 for now, as Qt 6.8 is moving to native-only (not cross-compiling) arm64 on
369+
# Windows (https://www.qt.io/blog/qt-for-windows-on-arm-may21-update) and there are not compatible runners.
370+
- { arch: arm64, qt: '6.8.0' }
371+
# Exclude MinGW (including LLVM) builds for arm64, since Qt does not provide those binaries yet.
372+
- { arch: arm64, toolchain: llvm }
373+
- { arch: arm64, toolchain: mingw }
374+
# Exclude LLVM builds for x86, since neither Qt nor GitHub runners provide 32-bit LLVM MinGW binaries.
375+
- { arch: x86, toolchain: llvm }
376+
# Exclude x86 (32-bit) builds for Qt 5.10.1 with MSVC. See https://bugreports.qt.io/browse/QTBUG-67259
377+
- { arch: x86, qt: '5.10.1', toolchain: msvc }
378+
# Exclude x86 (32-bit) builds for Qt 6.x, since the Qt online installer dropped those.
379+
- { arch: x86, qt: '6.2.4' }
380+
- { arch: x86, qt: '6.3.2' }
381+
- { arch: x86, qt: '6.4.3' }
382+
- { arch: x86, qt: '6.5.3' }
383+
- { arch: x86, qt: '6.6.3' }
384+
- { arch: x86, qt: '6.7.3' }
385+
- { arch: x86, qt: '6.8.0' }
386+
# Exclude MinGW (including LLVM) builds for x86-64 with Qt's earlier than 5.12, since the Qt online
387+
# installer (as used by aqtinstaller) did not include x86-64 binaries until Qt 5.12.
388+
- { arch: x86-64, qt: '5.9.9', toolchain: llvm }
389+
- { arch: x86-64, qt: '5.9.9', toolchain: mingw }
390+
- { arch: x86-64, qt: '5.10.1', toolchain: llvm }
391+
- { arch: x86-64, qt: '5.10.1', toolchain: mingw }
392+
- { arch: x86-64, qt: '5.11.3', toolchain: llvm }
393+
- { arch: x86-64, qt: '5.11.3', toolchain: mingw }
394+
# Exclude LLVM builds before Qt 6.7, since Qt didn't begin shipping llvm-mingw support until then.
395+
- { toolchain: llvm, qt: '5.9.9' }
396+
- { toolchain: llvm, qt: '5.10.1' }
397+
- { toolchain: llvm, qt: '5.11.3' }
398+
- { toolchain: llvm, qt: '5.12.12' }
399+
- { toolchain: llvm, qt: '5.13.2' }
400+
- { toolchain: llvm, qt: '5.14.2' }
401+
- { toolchain: llvm, qt: '5.15.2' }
402+
- { toolchain: llvm, qt: '6.2.4' }
403+
- { toolchain: llvm, qt: '6.3.2' }
404+
- { toolchain: llvm, qt: '6.4.3' }
405+
- { toolchain: llvm, qt: '6.5.3' }
406+
- { toolchain: llvm, qt: '6.6.3' }
407+
# \todo Temporarily exclude LLVM builds for Qt 6.7 and 6.8: https://github.com/miurahr/aqtinstall/issues/825
408+
- { toolchain: llvm, qt: '6.7.3' }
409+
- { toolchain: llvm, qt: '6.8.0' }
353410
include:
354411
# Map the aqtinstall (aqt) architectures.
355412
- { qt: '5.9.9', toolchain: mingw, arch: x86, aqtArch: win32_mingw53 }
413+
- { qt: '5.9.9', toolchain: msvc, arch: x86, aqtArch: win32_msvc2015 }
414+
- { qt: '5.9.9', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2013_64 }
415+
- { qt: '5.9.9', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2015_64 }
416+
- { qt: '5.9.9', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2017_64 }
356417
- { qt: '5.10.1', toolchain: mingw, arch: x86, aqtArch: win32_mingw53 }
418+
# { qt: '5.10.1', toolchain: msvc, arch: x86, aqtArch: win32_msvc2015 } # Excluded above (QTBUG-67259).
419+
- { qt: '5.10.1', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2013_64 }
420+
- { qt: '5.10.1', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2015_64 }
421+
- { qt: '5.10.1', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2017_64 }
357422
- { qt: '5.11.3', toolchain: mingw, arch: x86, aqtArch: win32_mingw53 }
423+
- { qt: '5.11.3', toolchain: msvc, arch: x86, aqtArch: win32_msvc2015 }
424+
- { qt: '5.11.3', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2015_64 }
425+
- { qt: '5.11.3', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2017_64 }
358426
- { qt: '5.12.12', toolchain: mingw, arch: x86, aqtArch: win32_mingw73 }
427+
- { qt: '5.12.12', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw73 }
428+
- { qt: '5.12.12', toolchain: msvc, arch: x86, aqtArch: win32_msvc2017 }
429+
- { qt: '5.12.12', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2015_64 }
430+
- { qt: '5.12.12', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2017_64 }
359431
- { qt: '5.13.2', toolchain: mingw, arch: x86, aqtArch: win32_mingw73 }
432+
- { qt: '5.13.2', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw73 }
433+
- { qt: '5.13.2', toolchain: msvc, arch: x86, aqtArch: win32_msvc2017 }
434+
- { qt: '5.13.2', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2015_64 }
435+
- { qt: '5.13.2', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2017_64 }
360436
- { qt: '5.14.2', toolchain: mingw, arch: x86, aqtArch: win32_mingw73 }
437+
- { qt: '5.14.2', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw73 }
438+
- { qt: '5.14.2', toolchain: msvc, arch: x86, aqtArch: win32_msvc2017 }
439+
- { qt: '5.14.2', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2015_64 }
440+
- { qt: '5.14.2', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2017_64 }
361441
- { qt: '5.15.2', toolchain: mingw, arch: x86, aqtArch: win32_mingw81 }
442+
- { qt: '5.15.2', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw81 }
443+
- { qt: '5.15.2', toolchain: msvc, arch: x86, aqtArch: win32_msvc2019 }
444+
- { qt: '5.15.2', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2015_64 }
445+
- { qt: '5.15.2', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2019_64 }
446+
- { qt: '6.2.4', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
447+
- { qt: '6.2.4', toolchain: msvc, arch: arm64, aqtArch: win64_msvc2019_arm64 }
448+
- { qt: '6.2.4', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2019_64 }
449+
- { qt: '6.3.2', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
450+
- { qt: '6.3.2', toolchain: msvc, arch: arm64, aqtArch: win64_msvc2019_arm64 }
451+
- { qt: '6.3.2', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2019_64 }
452+
- { qt: '6.4.3', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
453+
- { qt: '6.4.3', toolchain: msvc, arch: arm64, aqtArch: win64_msvc2019_arm64 }
454+
- { qt: '6.4.3', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2019_64 }
455+
- { qt: '6.5.3', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
456+
- { qt: '6.5.3', toolchain: msvc, arch: arm64, aqtArch: win64_msvc2019_arm64 }
457+
- { qt: '6.5.3', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2019_64 }
458+
- { qt: '6.6.3', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
459+
- { qt: '6.6.3', toolchain: msvc, arch: arm64, aqtArch: win64_msvc2019_arm64 }
460+
- { qt: '6.6.3', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2019_64 }
461+
# { qt: '6.7.3', toolchain: llvm, arch: x86-64, aqtArch: win64_llvm_mingw } \todo See temp exclusion above.
462+
- { qt: '6.7.3', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
463+
- { qt: '6.7.3', toolchain: msvc, arch: arm64, aqtArch: win64_msvc2019_arm64 }
464+
- { qt: '6.7.3', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2019_64 }
465+
# { qt: '6.8.0', toolchain: llvm, arch: x86-64, aqtArch: win64_llvm_mingw } \todo See temp exclusion above.
466+
- { qt: '6.8.0', toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
467+
- { qt: '6.8.0', toolchain: msvc, arch: x86-64, aqtArch: win64_msvc2022_64 }
468+
# Map the MSVC architecture.
469+
- { toolchain: msvc, arch: arm64, msvcArch: amd64_arm64 }
470+
- { toolchain: msvc, arch: x86, msvcArch: amd64_x86 }
471+
- { toolchain: msvc, arch: x86-64, msvcArch: amd64 }
362472
# Define the generator and dll names per toolchain.
473+
# { toolchain: 'llvm', generator: 'MinGW Makefiles', dll: libQtPokit.dll } \todo See temp exclusion above.
363474
- { toolchain: 'mingw', generator: 'MinGW Makefiles', dll: libQtPokit.dll }
475+
- { toolchain: 'msvc', generator: 'NMake Makefiles', dll: QtPokit.dll }
364476
# Optional additional tools to be installed by aqtinstall (via install-qt-action).
365477
- { toolchain: 'mingw', arch: x86, aqtTools: 'tools_mingw,qt.tools.win32_mingw810' }
478+
# Use Qt-provided 64-bit MinGW for recent Qt's (defaulting to GitHub's 12.2.0 version for older Qt versions).
479+
- { toolchain: 'mingw', arch: x86-64, qt: '5.14.2', aqtTools: 'tools_mingw1310' }
480+
- { toolchain: 'mingw', arch: x86-64, qt: '5.15.2', aqtTools: 'tools_mingw1310' }
481+
- { toolchain: 'mingw', arch: x86-64, qt: '6.4.3', aqtTools: 'tools_mingw1310' }
482+
- { toolchain: 'mingw', arch: x86-64, qt: '6.5.3', aqtTools: 'tools_mingw1310' }
483+
- { toolchain: 'mingw', arch: x86-64, qt: '6.6.3', aqtTools: 'tools_mingw1310' }
484+
- { toolchain: 'mingw', arch: x86-64, qt: '6.7.3', aqtTools: 'tools_mingw1310' }
485+
- { toolchain: 'mingw', arch: x86-64, qt: '6.8.0', aqtTools: 'tools_mingw1310' }
366486
steps:
367487
- uses: actions/checkout@v4
368488
- name: Install host Qt for cross-compilation
@@ -434,7 +554,7 @@ jobs:
434554
working-directory: ${{ runner.temp }}
435555
- name: Test # We can't execute arm64 binaries on an x86-64 host.
436556
if: matrix.arch != 'arm64'
437-
run: ctest --output-on-failure --test-dir "%RUNNER_TEMP%" --tests-regex AbstractCommand --verbose
557+
run: ctest --output-on-failure --test-dir "%RUNNER_TEMP%" --verbose
438558
- name: Upload test results
439559
if: matrix.arch != 'arm64' && fromJSON(steps.post-build.outputs.tap)
440560
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)