Skip to content

Commit 447de54

Browse files
committed
Choose 64-bit MinGW version based on Qt versions
And get some CMake debugging to understand the 32-bit MinGW issue.
1 parent b446f42 commit 447de54

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

.github/workflows/build.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,14 @@ jobs:
471471
- { toolchain: 'msvc', generator: 'NMake Makefiles', dll: QtPokit.dll }
472472
# Optional additional tools to be installed by aqt (via install-qt-action).
473473
- { toolchain: 'mingw', arch: x86, aqtTools: 'tools_mingw,qt.tools.win32_mingw810' }
474-
- { toolchain: 'mingw', arch: x86-64, aqtTools: 'tools_mingw1310' }
474+
# Use Qt-provided 64-bit MinGW for recent Qt's (defaulting to GitHub's 12.2.0 version for older Qt versions).
475+
- { toolchain: 'mingw', arch: x86-64, qt: '5.14.2', aqtTools: 'tools_mingw1310' }
476+
- { toolchain: 'mingw', arch: x86-64, qt: '5.15.2', aqtTools: 'tools_mingw1310' }
477+
- { toolchain: 'mingw', arch: x86-64, qt: '6.4.3', aqtTools: 'tools_mingw1310' }
478+
- { toolchain: 'mingw', arch: x86-64, qt: '6.5.3', aqtTools: 'tools_mingw1310' }
479+
- { toolchain: 'mingw', arch: x86-64, qt: '6.6.3', aqtTools: 'tools_mingw1310' }
480+
- { toolchain: 'mingw', arch: x86-64, qt: '6.7.3', aqtTools: 'tools_mingw1310' }
481+
- { toolchain: 'mingw', arch: x86-64, qt: '6.8.3', aqtTools: 'tools_mingw1310' }
475482
steps:
476483
- uses: actions/checkout@v4
477484
- name: Install host Qt for cross-compilation
@@ -527,6 +534,7 @@ jobs:
527534
cmake -D CMAKE_BUILD_TYPE=Release ^
528535
-D QT_HOST_PATH=%qtHostPath% ^
529536
-D QT_INSTALL_DOCS=%RUNNER_WORKSPACE%\Qt\Docs\Qt-${{ matrix.qt }} ^
537+
--debug-output ^
530538
-G "${{ matrix.generator }}" -S "%GITHUB_WORKSPACE%" -B "%RUNNER_TEMP%"
531539
cmake --build "%RUNNER_TEMP%"
532540
- name: Capture build-output variables

0 commit comments

Comments
 (0)