ci: update qt6 workflows

XMuli · XMuli · commit 905e8d6c575f · 2025-11-17T13:03:15.000+08:00
diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml
@@ -1,58 +1,53 @@
-name: MacOS
-on: 
-  push:
-    paths-ignore:
-      - '*.md'
-  pull_request:
-    paths-ignore:
-      - '*.md'
-jobs:
-  build:
-    name: Build
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-10.15]  # macos-10.14 macos-10.15, macos-11.0, macos-12.6  # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
-        qt_ver: [5.15.2]  # 参考: https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/mac_x64/desktop/qt5_5111
-        qt_arch: [clang_64]
-    env:
-      targetName: ChineseChess
-      targetOS: macos
-
-    steps:
-      # macos 11.0 后默认环境变了,要指定
-      - name: prepare env
-        if: ${{ matrix.os == 'macos-11.0' }}
-        run: |
-          softwareupdate --all --install --force
-          sudo xcode-select --print-path
-          sudo xcode-select --switch /Library/Developer/CommandLineTools
-      
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: ${{ matrix.qt_ver }}
-
+name: MacOS
+on: 
+  push:
+    branches:
+      - '**'
+    tags:
+      - 'v*'
+    paths-ignore:
+      - '*.md'
+  pull_request:
+    paths-ignore:
+      - '*.md'
+jobs:
+  build:
+    name: Build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-14]
+        qt_ver: ['6.7.2']
+        qt_arch: [clang_64]
+    env:
+      targetName: ChineseChess
+      targetOS: macos
+
+    steps:
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: ${{ matrix.qt_ver }}
+          arch: ${{ matrix.qt_arch }}
+
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
           submodules: true
 
-      - name: build macos
-        run: |
-          mkdir build
-          cd build
-          cmake ..
-          make
-
-          echo "-------------- debug 1 --------------"
-          pwd
-          ls -al
-
-          echo "-------------- debug 2 --------------"
-          cd bin
-          ls -al
-
+      - name: Configure & Build
+        run: |
+          cmake -S . -B build -DCMAKE_PREFIX_PATH="$Qt6_DIR"
+          cmake --build build --config Release -- -j$(sysctl -n hw.ncpu)
+
+          echo "-------------- debug 1 --------------"
+          pwd
+          ls -al
+
+          echo "-------------- debug 2 --------------"
+          cd build/bin
+          ls -al
+
       - name: NameVersion
         id: NameVersion
         if: startsWith(github.event.ref, 'refs/tags/')
@@ -121,4 +116,4 @@ jobs:
           files: |
             ${{ env.productName }}.dmg
           tag: ${{ github.ref }}
-          overwrite: true 
+          overwrite: true 
diff --git a/.github/workflows/Ubuntu_Deb.yml b/.github/workflows/Ubuntu_Deb.yml
@@ -1,6 +1,10 @@
 name: Ubuntu_DEB
 on: 
   push:
+    branches:
+      - '**'
+    tags:
+      - 'v*'
     paths-ignore:
       - '*.md'
   pull_request:
@@ -9,16 +13,11 @@ on:
 jobs:
   build:
     name: Build
-    # 运行平台， ubuntu-latest 目前是 Ubuntu 20.04
-    # 参考文档 https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md
     runs-on:  ${{ matrix.os }}
     strategy:
-      matrix: # 矩阵配置
-        qt_ver: [5.15.2]    # 参考: https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/linux_x64/desktop/qt5_5152
-        qt_target: [desktop]
-        qt_arch: [gcc_64]
-        arch: [amd64]  # arm64
-        os: [ubuntu-20.04]
+      matrix:
+        include:
+          - os: ubuntu-24.04
     env:
       targetName: ChineseChess
       targetLowerName: chinesechess
@@ -53,7 +52,8 @@ jobs:
         run: |
           sudo apt clean
           sudo apt update
-          sudo apt install vim wget tar dh-make debmake lintian cmake qtbase5-dev qt5-default libqt5svg5-dev qtmultimedia5-dev qttools5-dev libqt5x11extras5-dev
+          sudo apt install -y vim wget tar dh-make debmake lintian cmake ninja-build libgl1-mesa-dev \
+            qt6-base-dev qt6-tools-dev qt6-tools-dev-tools qt6-wayland-dev libqt6svg6-dev libqt6opengl6-dev
 
       # tag 打包 .deb，无动态库
       - name: DebPackage
@@ -114,4 +114,4 @@ jobs:
           files: |
             ../*.deb
           tag: ${{ github.ref }}
-          overwrite: true 
+          overwrite: true 
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -1,6 +1,10 @@
 name: Ubuntu
 on: 
   push:
+    branches:
+      - '**'
+    tags:
+      - 'v*'
     paths-ignore:
       - '*.md'
   pull_request:
@@ -9,23 +13,20 @@ on:
 jobs:
   build:
     name: Build
-    # 运行平台， ubuntu-latest 目前是 Ubuntu 20.04
-    # 参考文档 https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md
     runs-on:  ${{ matrix.os }}
     strategy:
-      matrix: # 矩阵配置
-        qt_ver: [5.15.2]    # 参考: https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/linux_x64/desktop/qt5_51211
-        qt_target: [desktop]
-        qt_arch: [gcc_64]
-        arch: [arm64, amd64]
-        os: [ubuntu-20.04] # ubuntu-18.04
+      matrix:
+        include:
+          - os: ubuntu-24.04
+            qt_ver: '6.7.2'
+            qt_arch: gcc_64
     env:
       targetName: ChineseChess
       targetOS: debian
       
     steps:
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ matrix.qt_ver }}
           arch: ${{ matrix.qt_arch }}
@@ -36,14 +37,17 @@ jobs:
           fetch-depth: 1
           submodules: true
 
+      - name: Install build deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ninja-build libgl1-mesa-dev libpulse-dev
+
       - name: gcc build
         id: gcc-build
         shell: bash
         run: |
-          mkdir build
-          cd build
-          cmake ..
-          make
+          cmake -S . -B build -GNinja -DCMAKE_PREFIX_PATH="$Qt6_DIR"
+          cmake --build build
      
       - name: NameVersion
         id: NameVersion
@@ -65,7 +69,11 @@ jobs:
         shell: bash
         run: |
           mkdir bin
-          cp -r build/bin/${{ env.targetName }} bin
+          target_path="build/bin/${{ env.targetName }}"
+          if [ ! -f "$target_path" ]; then
+            target_path="${{ github.workspace }}/bin/${{ env.targetName }}"
+          fi
+          cp "$target_path" bin/${{ env.targetName }}
           cp -r debian_portable/* bin
           
           sudo chmod 777 bin/ldd.sh
@@ -88,4 +96,4 @@ jobs:
           files: |
             ${{ env.productName }}.zip
           tag: ${{ github.ref }}
-          overwrite: true 
+          overwrite: true 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -1,43 +1,39 @@
-name: Windows
-on: 
-  push:
-    paths-ignore:
-      - '*.md'
-  pull_request:
-    paths-ignore:
-      - '*.md'
-jobs:
-  build:
-    name: Build
-    # 运行平台， windows-latest目前是windows server 2022
-    # 参考文档 https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md https://github.com/actions/runner-images/issues/12045 https://github.com/arvidn/libtorrent/pull/7932
-    runs-on: windows-latest
-    strategy:
-      # 矩阵配置
-      matrix:
-        qt_target: [desktop]
-        include:
-          # 5.15.2 参考 https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/windows_x86/desktop/qt5_5152/
-          - qt_ver: 5.15.2
-            qt_arch: win32_msvc2019
-            msvc_arch: x86
-            qt_arch_install: msvc2019
-          - qt_ver: 5.15.2           
-            qt_arch: win64_msvc2019_64
-            msvc_arch: x64
-            qt_arch_install: msvc2019_64
-    env:
-      targetName: ChineseChess
-      targetOS: windows
-
-    steps:
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: ${{ matrix.qt_ver }}
-          arch: ${{ matrix.qt_arch }}
-          set-env: true
-
+name: Windows
+on: 
+  push:
+    branches:
+      - '**'
+    tags:
+      - 'v*'
+    paths-ignore:
+      - '*.md'
+  pull_request:
+    paths-ignore:
+      - '*.md'
+jobs:
+  build:
+    name: Build
+    # windows-2022 runners map to Windows 11 environments
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - os: windows-2022
+            qt_ver: '6.7.2'
+            qt_arch: win64_msvc2019_64
+            msvc_arch: x64
+    env:
+      targetName: ChineseChess
+      targetOS: windows
+
+    steps:
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: ${{ matrix.qt_ver }}
+          arch: ${{ matrix.qt_arch }}
+          set-env: true
+
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
@@ -110,31 +106,24 @@ jobs:
             Write-Host "`n检查完成：未发现不可见Unicode字符。"
           }
 
-      - name: Inspect Qt
-        shell: pwsh
-        run: |
-          Get-ChildItem -Recurse -Path $Env:Qt5_Dir
-
-      - name: msvc-build
-        id: msvc-build
-        shell: cmd
-        run: |
-          mkdir bin
-          mkdir build
-
-          cd build
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }}
-
-          if "${{ matrix.msvc_arch }}" == "x86" (
-            echo "-------------- x86 --------------"
-            cmake -G "Visual Studio 17 2019" -A Win32 ..
-            devenv "${{ env.targetName }}.sln" /Build "Release|Win32"
-          ) else (
-            echo "-------------- x64 --------------"
-            cmake -G "Visual Studio 16 2019" -A x64 ..
-            devenv "${{ env.targetName }}.sln" /Build "Release|x64"
-          )
-     
+      - name: Inspect Qt
+        shell: pwsh
+        run: |
+          Get-ChildItem -Recurse -Path $Env:Qt6_DIR
+
+      - name: Configure & Build (MSVC)
+        id: msvc-build
+        shell: cmd
+        run: |
+          mkdir bin
+          mkdir build
+
+          cd build
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }}
+
+          cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_PREFIX_PATH="%Qt6_DIR%" ..
+          cmake --build . --config Release
+     
       - name: name version
         id: name-version
         if: startsWith(github.event.ref, 'refs/tags/')
@@ -165,9 +154,10 @@ jobs:
           Compress-Archive -Path ${{ github.workspace }}/bin/* -Destination ${{ env.productName }}.zip
           dir ${{ github.workspace }}/bin
 
-      - uses: actions/upload-artifact@v3
-        with:
-          name: my-artifact
+      - uses: actions/upload-artifact@v3
+        if: startsWith(github.event.ref, 'refs/tags/')
+        with:
+          name: my-artifact
           path: ${{ env.productName }}.zip
     
       # tag上传Release
@@ -182,4 +172,4 @@ jobs:
           files: |
             ${{ env.productName }}.zip
           tag: ${{ github.ref }}
-          overwrite: true
+          overwrite: true
