Merge branch 'main' of https://github.com/QQxiaoming/TTFviewer into main

QQxiaoming · Nov 6, 2023 · a961bbb · a961bbb
2 parents 12f13e5 + 477bbdb
commit a961bbb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3.3.0
+        uses: jurplel/install-qt-action@v4
         with:
           version: '6.2.0'
 

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3.3.0
+        uses: jurplel/install-qt-action@v4
         with:
           version: '6.2.0'
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3.3.0
+        uses: jurplel/install-qt-action@v4
         with:
           arch: win64_mingw81
           version: '6.2.0'
@@ -36,6 +36,7 @@ jobs:
         run: |
           Choco-Install -PackageName innosetup --force
           Choco-Install -PackageName cmake --force
+          Choco-Install -PackageName mingw --force
 
       - uses: msys2/setup-msys2@v2
 
@@ -44,7 +45,8 @@ jobs:
         run: |
           pacman --noconfirm -S make
           cd depend
-          export PATH=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin:$PATH
+          export PATH=/c/ProgramData/mingw64/mingw64/bin:$PATH
+          ls /c/ProgramData/mingw64/mingw64/bin
           ./build_ms.sh
 
       - name: Build all

diff --git a/build_setup.bat b/build_setup.bat
@@ -39,8 +39,6 @@ xcopy /y .\build_release\out\TTFviewer.exe .\InnoSetup\build\
 xcopy /y .\test\* .\InnoSetup\build\test\
 :: 使用windeployqt拷贝依赖dll库到打包目录
 windeployqt --dir .\InnoSetup\build .\InnoSetup\build\TTFviewer.exe
-xcopy /y "%QT_TOOLS_DIR%\..\bin\lib*.dll" ".\InnoSetup\build\"
-xcopy /y "%QT_TOOLS_DIR%\..\lib\lib*.dll" ".\InnoSetup\build\"
 :: 打包
 echo "wait inno build setup..."
 iscc /q ".\InnoSetup\build_temp_setup.iss"