Merge branch 'staged' into dev

xiaoyifang · Jun 24, 2024 · 811ab5b · 811ab5b
2 parents 46c9376 + fba8fd2
commit 811ab5b
Show file tree

Hide file tree

Showing 48 changed files with 315 additions and 798 deletions.
diff --git a/.github/workflows/cmake build check.yml → .github/workflows/PR-check-cmake.yml b/.github/workflows/cmake build check.yml → .github/workflows/PR-check-cmake.yml
@@ -1,4 +1,4 @@
-name: CMake Build Check
+name: Build Check
 concurrency: 
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -57,12 +57,12 @@ jobs:
 
       - name: Run build-wrapper
         run: |
-          cmake .   -DWITH_FFMPEG_PLAYER=OFF 
+          cmake .
           cmake --build .
 
   job2:
     name: windows Build and analyze
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       - uses: actions/setup-python@v3
         with:
@@ -84,7 +84,7 @@ jobs:
 
       - name: Run build-wrapper
         run: |
-          cmake -S .   -DWITH_FFMPEG_PLAYER=OFF 
+          cmake -S . -DWITH_FFMPEG_PLAYER=OFF
           cmake --build . --config Release
   job3:
     name: macos Build and analyze
@@ -137,7 +137,6 @@ jobs:
           brew install icu4c
       - name: Run build-wrapper
         run: |
-          export PKG_CONFIG_PATH=/opt/homebrew/opt/icu4c/lib/pkgconfig:/usr/local/opt/icu4c/lib/pkgconfig:"$PKG_CONFIG_PATH"
-          cmake .   -DWITH_FFMPEG_PLAYER=OFF 
+          cmake .
           cmake --build .                  
       
diff --git a/.github/workflows/windows-PR-check.yml → .github/workflows/PR-check-windows.yml b/.github/workflows/windows-PR-check.yml → .github/workflows/PR-check-windows.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [5.15.2,6.6.3]
+        qt_ver: [6.6.3]
         qt_arch: [win64_msvc2019_64]
     steps:
       - uses: actions/setup-python@v3

diff --git a/.github/workflows/macos-homebrew-PR-check.yml b/.github/workflows/macos-homebrew-PR-check.yml
diff --git a/.github/workflows/macos-homebrew-breakpad.yml b/.github/workflows/macos-homebrew-breakpad.yml
diff --git a/.github/workflows/AutoTag.yml → .github/workflows/release-AutoTag.yml b/.github/workflows/AutoTag.yml → .github/workflows/release-AutoTag.yml
@@ -1,4 +1,4 @@
-name: AutoTag
+name: Release AutoTag
 concurrency: 
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true

diff --git a/.github/workflows/macos-homebrew.yml → .github/workflows/release-macos-homebrew.yml b/.github/workflows/macos-homebrew.yml → .github/workflows/release-macos-homebrew.yml
@@ -1,4 +1,4 @@
-name: macos-homebrew
+name: Release macOS
 concurrency: 
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-12,macos-14]
-        qt_ver: [ 6.7.1 ]
+        qt_ver: [ 6.7.2 ]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict

diff --git a/.github/workflows/windows-6.x.yml → .github/workflows/release-windows.yml b/.github/workflows/windows-6.x.yml → .github/workflows/release-windows.yml
@@ -1,4 +1,4 @@
-name: Windows-6.x
+name: Release Windows
 concurrency: 
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [ 6.6.3,6.7.1 ]
+        qt_ver: [ 6.6.3,6.7.2 ]
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe