Override gcov on 32-bit systems

pcolby · Oct 13, 2024 · cf1a046 · cf1a046
1 parent 3f87d92
commit cf1a046
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -552,11 +552,13 @@ jobs:
       - name: Build
         env:
           CMAKE_MESSAGE_LOG_LEVEL: VERBOSE
+          CODECOV_GCOV: ${{ matrix.arch == 'x86' && 'C:/mingw64/bin/gcov.exe' || '' }}
           ENABLE_COVERAGE: ${{ matrix.toolchain == 'msvc' && 'false' || 'true' }}
           PROJECT_BUILD_ID: ${{ github.run_number }}.win.${{ matrix.arch }}.${{ matrix.toolchain }}.qt-${{ matrix.qt }}
         run: |
           echo "%PATH%"
           cmake -D CMAKE_BUILD_TYPE=Release ^
+                -D CODECOV_GCOV=%CODECOV_GCOV% ^
                 -D ENABLE_COVERAGE=%ENABLE_COVERAGE% ^
                 -D QT_HOST_PATH=%qtHostPath% ^
                 -D QT_INSTALL_DOCS=%RUNNER_WORKSPACE%\Qt\Docs\Qt-${{ matrix.qt }} ^
@@ -581,16 +583,16 @@ jobs:
         run: ctest --output-on-failure --test-dir "%RUNNER_TEMP%" --verbose
       - run: dir . /s
         working-directory: ${{ runner.temp }}
-      - run: lcov --capture --directory . --gcov-tool D:/a/dokit/Qt/Tools/mingw810_32/bin/gcov.exe --output-file coverage.info
-        shell: bash #C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
-        working-directory: ${{ runner.temp }}
-      #- name: Collate test coverage
-      #  if: matrix.toolchain != 'msvc'
-      #  run: cmake --build "%RUNNER_TEMP%" --target coverage --verbose
+      #- run: lcov --capture --directory . --output-file coverage.info
+      #  shell: bash #C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
+      #  working-directory: ${{ runner.temp }}
       - name: Collate test coverage
         if: matrix.toolchain != 'msvc'
-        shell: bash
-        run: cmake --build "$RUNNER_TEMP" --target coverage --verbose
+        run: cmake --build "%RUNNER_TEMP%" --target coverage --verbose
+      #- name: Collate test coverage
+      #  if: matrix.toolchain != 'msvc'
+      #  shell: bash
+      #  run: cmake --build "$RUNNER_TEMP" --target coverage --verbose
       - name: Upload test results
         if: matrix.arch != 'arm64' && fromJSON(steps.post-build.outputs.tap)
         uses: actions/upload-artifact@v4