Tidy up a little

pcolby · Oct 13, 2024 · fccb73a · fccb73a
1 parent 7ee5376
commit fccb73a
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -492,23 +492,23 @@ jobs:
       #- if: matrix.arch == 'x86' && matrix.toolchain == 'mingw'
       #  shell: bash
       #  run: tee -a "$GITHUB_PATH" <<< 'C:\mingw32\bin'
-      - name: Install LCOV
-        if: matrix.toolchain != 'msvc'
-        run: C:\msys64\usr\bin\pacman --sync --noconfirm --verbose mingw-w64-x86_64-lcov
       #- run: /c/msys64/mingw64/bin/lcov --version
       #  shell: bash
       - name: Configure path
         if: matrix.toolchain != 'msvc'
         shell: bash
         run: |
-          tee -a "$GITHUB_PATH" <<< 'C:\msys64\usr\bin'
-          # We need to add MSYS2's mingw64 to the path so that LCOV can find it's own geninfo utility. However, we do
-          # this before all other mingw installs (including those from install-qt-action) so those take precendence.
-          #tee -a "$GITHUB_PATH" <<< 'C:\msys64\mingw64\bin'
-          # For 32-bit (x86) MinGW builds, place GitHub's mingw32 at the head of the path (install-qt-actions could
-          # supersede this below, but we never install (32-bit) mingw32 via install-qt-actions).
+          # Paths needed for MSYS2's LCOV to function properly. Note, its important that we add the mingw64 one here
+          # before any later mingw installs (including those from install-qt-action) or this would interfere with those.
+          tee -a "$GITHUB_PATH" <<< 'C:\msys64\mingw64\bin' # Else lcov will fail to find its own geninfo command.
+          tee -a "$GITHUB_PATH" <<< 'C:\msys64\usr\bin'     # Else geninfo will fail to find .gcda files (not sure why).
+          # For 32-bit (x86) MinGW builds, place GitHub's mingw32 at the head of the path (install-qt-actions would
+          # supersede this below, but we never install (32-bit) mingw32 via install-qt-actions, so not an issue).
           [[ '${{ matrix.toolchain }}' != 'mingw' || '${{ matrix.arch }}' != 'x86' ]] ||
             tee -a "$GITHUB_PATH" <<< 'C:\mingw32\bin'
+      - name: Install LCOV
+        if: matrix.toolchain != 'msvc'
+        run: pacman --sync --noconfirm --verbose mingw-w64-x86_64-lcov
       - run: echo "%PATH%"
       - run: echo "$PATH"
         shell: bash