@@ -477,7 +477,7 @@ jobs:
477
477
- { toolchain: 'mingw', generator: 'MinGW Makefiles', dll: libQtPokit.dll }
478
478
# - { toolchain: 'msvc', generator: 'NMake Makefiles', dll: QtPokit.dll }
479
479
# Optional additional tools to be installed by aqtinstall (via install-qt-action).
480
- - { toolchain: 'mingw', arch: x86, aqtTools: 'tools_mingw,qt.tools.win32_mingw810' }
480
+ # - { toolchain: 'mingw', arch: x86, aqtTools: 'tools_mingw,qt.tools.win32_mingw810' }
481
481
# Use Qt-provided 64-bit MinGW for recent Qt's (defaulting to GitHub's 12.2.0 version for older Qt versions).
482
482
- { toolchain: 'mingw', arch: x86-64, qt: '5.14.2', aqtTools: 'tools_mingw1310' }
483
483
- { toolchain: 'mingw', arch: x86-64, qt: '5.15.2', aqtTools: 'tools_mingw1310' }
@@ -492,6 +492,9 @@ jobs:
492
492
run : |
493
493
tee -a "$GITHUB_PATH" <<< 'C:\msys64\usr\bin'
494
494
tee -a "$GITHUB_PATH" <<< 'C:\msys64\mingw64\bin'
495
+ - if : matrix.arch == 'x86' && matrix.toolchain == 'mingw'
496
+ shell : bash
497
+ run : tee -a "$GITHUB_PATH" <<< 'C:\mingw32\bin'
495
498
- run : echo "%PATH%"
496
499
- run : echo "$PATH"
497
500
shell : bash
@@ -563,12 +566,12 @@ jobs:
563
566
run : |
564
567
echo "%PATH%"
565
568
cmake -D CMAKE_BUILD_TYPE=Release ^
566
- %CODECOV_GCOV_FLAG% %CODECOV_GCOV_VALUE% ^
567
569
-D ENABLE_COVERAGE=%ENABLE_COVERAGE% ^
568
570
-D QT_HOST_PATH=%qtHostPath% ^
569
571
-D QT_INSTALL_DOCS=%RUNNER_WORKSPACE%\Qt\Docs\Qt-${{ matrix.qt }} ^
570
572
-G "${{ matrix.generator }}" -S "%GITHUB_WORKSPACE%" -B "%RUNNER_TEMP%"
571
573
cmake --build "%RUNNER_TEMP%" --verbose
574
+ # %CODECOV_GCOV_FLAG% %CODECOV_GCOV_VALUE% ^
572
575
# -D CODECOV_GCOV=D:\a\dokit\Qt\Tools\mingw810_32\bin\gcov.exe ^
573
576
# -D CODECOV_LCOV=C:\msys64\mingw64\bin\lcov ^
574
577
- name : Capture build-output variables
0 commit comments