Skip to content

Commit b7bb11a

Browse files
committed
Use GH's mingw32
1 parent 68a3336 commit b7bb11a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

.github/workflows/build.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ jobs:
477477
- { toolchain: 'mingw', generator: 'MinGW Makefiles', dll: libQtPokit.dll }
478478
#- { toolchain: 'msvc', generator: 'NMake Makefiles', dll: QtPokit.dll }
479479
# 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' }
481481
# Use Qt-provided 64-bit MinGW for recent Qt's (defaulting to GitHub's 12.2.0 version for older Qt versions).
482482
- { toolchain: 'mingw', arch: x86-64, qt: '5.14.2', aqtTools: 'tools_mingw1310' }
483483
- { toolchain: 'mingw', arch: x86-64, qt: '5.15.2', aqtTools: 'tools_mingw1310' }
@@ -492,6 +492,9 @@ jobs:
492492
run: |
493493
tee -a "$GITHUB_PATH" <<< 'C:\msys64\usr\bin'
494494
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'
495498
- run: echo "%PATH%"
496499
- run: echo "$PATH"
497500
shell: bash
@@ -563,12 +566,12 @@ jobs:
563566
run: |
564567
echo "%PATH%"
565568
cmake -D CMAKE_BUILD_TYPE=Release ^
566-
%CODECOV_GCOV_FLAG% %CODECOV_GCOV_VALUE% ^
567569
-D ENABLE_COVERAGE=%ENABLE_COVERAGE% ^
568570
-D QT_HOST_PATH=%qtHostPath% ^
569571
-D QT_INSTALL_DOCS=%RUNNER_WORKSPACE%\Qt\Docs\Qt-${{ matrix.qt }} ^
570572
-G "${{ matrix.generator }}" -S "%GITHUB_WORKSPACE%" -B "%RUNNER_TEMP%"
571573
cmake --build "%RUNNER_TEMP%" --verbose
574+
# %CODECOV_GCOV_FLAG% %CODECOV_GCOV_VALUE% ^
572575
# -D CODECOV_GCOV=D:\a\dokit\Qt\Tools\mingw810_32\bin\gcov.exe ^
573576
# -D CODECOV_LCOV=C:\msys64\mingw64\bin\lcov ^
574577
- name: Capture build-output variables

0 commit comments

Comments
 (0)