Use GH's mingw32

pcolby · Oct 13, 2024 · b7bb11a · b7bb11a
1 parent 68a3336
commit b7bb11a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -477,7 +477,7 @@ jobs:
           - { toolchain: 'mingw', generator: 'MinGW Makefiles', dll: libQtPokit.dll }
           #- { toolchain: 'msvc',  generator: 'NMake Makefiles', dll: QtPokit.dll }
           # Optional additional tools to be installed by aqtinstall (via install-qt-action).
-          - { toolchain: 'mingw', arch: x86, aqtTools: 'tools_mingw,qt.tools.win32_mingw810' }
+          #- { toolchain: 'mingw', arch: x86, aqtTools: 'tools_mingw,qt.tools.win32_mingw810' }
           # Use Qt-provided 64-bit MinGW for recent Qt's (defaulting to GitHub's 12.2.0 version for older Qt versions).
           - { toolchain: 'mingw', arch: x86-64, qt: '5.14.2', aqtTools: 'tools_mingw1310' }
           - { toolchain: 'mingw', arch: x86-64, qt: '5.15.2', aqtTools: 'tools_mingw1310' }
@@ -492,6 +492,9 @@ jobs:
         run: |
           tee -a "$GITHUB_PATH" <<< 'C:\msys64\usr\bin'
           tee -a "$GITHUB_PATH" <<< 'C:\msys64\mingw64\bin'
+      - if: matrix.arch == 'x86' && matrix.toolchain == 'mingw'
+        shell: bash
+        run: tee -a "$GITHUB_PATH" <<< 'C:\mingw32\bin'
       - run: echo "%PATH%"
       - run: echo "$PATH"
         shell: bash
@@ -563,12 +566,12 @@ jobs:
         run: |
           echo "%PATH%"
           cmake -D CMAKE_BUILD_TYPE=Release ^
-                %CODECOV_GCOV_FLAG% %CODECOV_GCOV_VALUE% ^
                 -D ENABLE_COVERAGE=%ENABLE_COVERAGE% ^
                 -D QT_HOST_PATH=%qtHostPath% ^
                 -D QT_INSTALL_DOCS=%RUNNER_WORKSPACE%\Qt\Docs\Qt-${{ matrix.qt }} ^
                 -G "${{ matrix.generator }}" -S "%GITHUB_WORKSPACE%" -B "%RUNNER_TEMP%"
           cmake --build "%RUNNER_TEMP%" --verbose
+#                %CODECOV_GCOV_FLAG% %CODECOV_GCOV_VALUE% ^
 #                -D CODECOV_GCOV=D:\a\dokit\Qt\Tools\mingw810_32\bin\gcov.exe ^
 #                -D CODECOV_LCOV=C:\msys64\mingw64\bin\lcov ^
       - name: Capture build-output variables