Skip to content

Commit 19c12e3

Browse files
committed
Revert to GH's MSYS2
1 parent bb4e852 commit 19c12e3

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

.github/workflows/build.yaml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -521,21 +521,17 @@ jobs:
521521
name: aqtinstall-log-win-${{ matrix.arch }}-${{ matrix.toolchain }}-${{ matrix.qt }}
522522
path: aqtinstall.log
523523
if-no-files-found: error
524-
- name: Setup MSYS2
524+
- name: Install LCOV
525525
if: matrix.toolchain != 'msvc'
526-
uses: msys2/setup-msys2@v2
527-
with:
528-
install: mingw-w64-x86_64-lcov
529-
#- name: Install LCOV
530-
# if: matrix.toolchain != 'msvc'
531-
# run: |
532-
# C:\msys64\usr\bin\pacman --sync --noconfirm --verbose mingw-w64-x86_64-lcov
533-
# echo 'C:\msys64\mingw64\bin' >> "%GITHUB_PATH%"
526+
run: |
527+
C:\msys64\usr\bin\pacman --sync --noconfirm --verbose mingw-w64-x86_64-lcov
528+
echo 'C:\msys64\mingw64\bin' >> "%GITHUB_PATH%"
534529
- run: dir C:\msys64\ /s
535530
- name: Configure cross-compilation
536531
if: matrix.arch == 'arm64'
537532
shell: bash
538533
run: |
534+
echo "$PATH"
539535
echo "CMAKE_TOOLCHAIN_FILE=${QT_ROOT_DIR/_64/_arm64/}\lib\cmake\Qt6\qt.toolchain.cmake" >> $GITHUB_ENV
540536
echo "qtHostPath=${QT_ROOT_DIR/_arm64/_64}" >> $GITHUB_ENV
541537
- name: Configure MSVC

0 commit comments

Comments
 (0)