From 0e037b9953c377dec199603e2b38d0590a051e9f Mon Sep 17 00:00:00 2001 From: Dongxu Li Date: Fri, 10 May 2024 08:22:31 -0400 Subject: [PATCH] Update build-all.yml --- .github/workflows/build-all.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml index 26e3fc7755..758961eb39 100644 --- a/.github/workflows/build-all.yml +++ b/.github/workflows/build-all.yml @@ -145,15 +145,15 @@ jobs: with: fetch-depth: 0 - - name: Uninstall incorrect mingw - run: | - choco uninstall mingw --force - choco uninstall strawberryperl --force + #- name: Uninstall incorrect mingw + # run: | + # choco uninstall mingw --force + # choco uninstall strawberryperl --force - - name: Set up MinGW - uses: egor-tensin/setup-mingw@v2 - with: - platform: x64 + #- name: Set up MinGW + # uses: egor-tensin/setup-mingw@v2 + # with: + # platform: x64 - name: Install Qt6 uses: jurplel/install-qt-action@v3 @@ -206,7 +206,9 @@ jobs: echo. dir ..\Qt\6.6.3\mingw_64\bin echo. - dir C:\mingw64\bin + dir C:\msys64\ucrt64\bin + dir C:\msys64\usr\bin + where mingw32-make.exe - name: Add msbuild to PATH @@ -214,7 +216,7 @@ jobs: - name: Build run: | - set PATH=C:\mingw64\bin;%PATH% + set PATH=C:\msys64\ucrt64\bin;C:\msys64\usr\bin;%PATH% copy CI\custom-win.pri custom.pri copy CI\custom-win-x64.nsh scripts\postprocess-windows\custom.nsh echo SET: