diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7dea1d86f..d790deac0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -521,11 +521,16 @@ jobs: name: aqtinstall-log-win-${{ matrix.arch }}-${{ matrix.toolchain }}-${{ matrix.qt }} path: aqtinstall.log if-no-files-found: error - - name: Install LCOV + - name: Setup MSYS2 if: matrix.toolchain != 'msvc' - run: | - C:\msys64\usr\bin\pacman --sync --noconfirm --verbose mingw-w64-x86_64-lcov - echo 'C:\msys64\mingw64\bin' >> "%GITHUB_PATH%" + uses: msys2/setup-msys2@v2 + with: + install: mingw-w64-x86_64-lcov + #- name: Install LCOV + # if: matrix.toolchain != 'msvc' + # run: | + # C:\msys64\usr\bin\pacman --sync --noconfirm --verbose mingw-w64-x86_64-lcov + # echo 'C:\msys64\mingw64\bin' >> "%GITHUB_PATH%" - run: dir C:\msys64\ /s - name: Configure cross-compilation if: matrix.arch == 'arm64' @@ -546,13 +551,13 @@ jobs: PROJECT_BUILD_ID: ${{ github.run_number }}.win.${{ matrix.arch }}.${{ matrix.toolchain }}.qt-${{ matrix.qt }} run: | cmake -D CMAKE_BUILD_TYPE=Release ^ - -D CODECOV_GCOV=D:\a\dokit\Qt\Tools\mingw810_32\bin\gcov.exe ^ - -D CODECOV_LCOV=C:\msys64\mingw64\bin\lcov ^ -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 +# -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 id: post-build shell: bash