Update build-all.yml

dxli · May 10, 2024 · 0e037b9 · 0e037b9
1 parent 6d88f55
commit 0e037b9
Showing 1 changed file with 12 additions and 10 deletions.
diff --git 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,15 +206,17 @@ 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
         uses: microsoft/setup-msbuild@v2
 
       - 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: