From dcd8ceec0501dac6bf84cff8cd4ce90e9d7fcd1c Mon Sep 17 00:00:00 2001 From: Paul Colby Date: Sun, 13 Oct 2024 22:53:08 +1100 Subject: [PATCH] Choose between two gcov's --- .github/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 19bcba161..497037f4a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -553,7 +553,7 @@ jobs: env: CMAKE_MESSAGE_LOG_LEVEL: VERBOSE #CODECOV_GCOV: ${{ matrix.arch == 'x86' && 'C:/mingw64/bin/gcov.exe' || '' }} - CODECOV_GCOV: 'C:/mingw64/bin/gcov.exe' + CODECOV_GCOV: ${{ maxtrix.aqtTool && 'D:/a/dokit/Qt/Tools/mingw1310_64/bin/gcov.exe' || '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: | @@ -584,9 +584,9 @@ jobs: run: ctest --output-on-failure --test-dir "%RUNNER_TEMP%" --verbose - run: dir . /s working-directory: ${{ runner.temp }} - - 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 }} + #- 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' run: cmake --build "%RUNNER_TEMP%" --target coverage --verbose