fix: CI/CD

XMuli · Jan 25, 2024 · 06a3b1d · 06a3b1d
1 parent 28ba633
commit 06a3b1d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 29 deletions.
diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml
@@ -12,8 +12,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-10.15]  # macos-10.14 macos-10.15, macos-11.0  # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
-        qt_ver: [5.12.11]  # 参考: https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/mac_x64/desktop/qt5_5111
+        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
@@ -29,11 +29,11 @@ jobs:
           sudo xcode-select --switch /Library/Developer/CommandLineTools
       
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
           submodules: true

diff --git a/.github/workflows/Linux.yml → .github/workflows/Ubuntu.yml b/.github/workflows/Linux.yml → .github/workflows/Ubuntu.yml
@@ -14,24 +14,24 @@ jobs:
     runs-on:  ${{ matrix.os }}
     strategy:
       matrix: # 矩阵配置
-        qt_ver: [5.12.11]    # 参考: https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/linux_x64/desktop/qt5_51211
+        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: [amd64]  # arm64
+        arch: [arm64, amd64]
         os: [ubuntu-20.04] # ubuntu-18.04
     env:
       targetName: ChineseChess
       targetOS: debian
 
     steps:
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
           arch: ${{ matrix.qt_arch }}
           set-env: true
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
           submodules: true

diff --git a/.github/workflows/LinuxDeb.yml → .github/workflows/Ubuntu_Deb.yml b/.github/workflows/LinuxDeb.yml → .github/workflows/Ubuntu_Deb.yml
@@ -14,18 +14,18 @@ jobs:
     runs-on:  ${{ matrix.os }}
     strategy:
       matrix: # 矩阵配置
-        qt_ver: [5.12.11]    # 参考: https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/linux_x64/desktop/qt5_51211
+        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: [arm64, amd64]
-        os: [ubuntu-20.04] # ubuntu-18.04
+        arch: [amd64]  # arm64
+        os: [ubuntu-20.04]
     env:
       targetName: ChineseChess
       targetLowerName: chinesechess
       targetOS: debian
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
           submodules: true

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -10,34 +10,35 @@ jobs:
   build:
     name: Build
     # 运行平台， windows-latest目前是windows server 2022
-    # 参考文档 https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md
+    # 参考文档 https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md
     runs-on: windows-2019
     strategy:
       # 矩阵配置
       matrix:
+        qt_target: [desktop]
         include:
-          # 5.12.11 参考 https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/windows_x86/desktop/qt5_51211/            
-          - qt_ver: 5.12.11
-            qt_arch: win32_msvc2017
+          # 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: msvc2017
-          # - qt_ver: 5.12.11           
-          #   qt_arch: win64_msvc2017_64
-          #   msvc_arch: x64
-          #   qt_arch_install: msvc2017_64
+            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@v2
+        uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
           arch: ${{ matrix.qt_arch }}
           set-env: true
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
           submodules: true
@@ -59,7 +60,7 @@ jobs:
 
           if "${{ matrix.msvc_arch }}" == "x86" (
             echo "-------------- x86 --------------"
-            cmake -G "Visual Studio 16 2019" -A Win32 ..
+            cmake -G "Visual Studio 17 2019" -A Win32 ..
             devenv "${{ env.targetName }}.sln" /Build "Release|Win32"
           ) else (
             echo "-------------- x64 --------------"

diff --git a/README.md b/README.md
@@ -13,8 +13,8 @@
 
 ![](https://img.shields.io/github/license/XMuli/chineseChess) ![](https://img.shields.io/github/v/release/XMuli/ChineseChess?style=flat&color=birightgreen)![](https://img.shields.io/badge/powered%20by-XMuli-ff69b4)![](https://img.shields.io/github/stars/XMuli/ChineseChess?style=social) ![](https://img.shields.io/github/forks/XMuli/ChineseChess?style=social&label=Fork)
 
-![](https://img.shields.io/github/workflow/status/XMuli/ChineseChess/Windows?style=flat&logo=windows) ![](https://img.shields.io/github/workflow/status/XMuli/ChineseChess/MacOS?style=flat&logo=apple) ![](https://img.shields.io/github/workflow/status/XMuli/ChineseChess/Linux?style=flat&logo=linux) ![](https://img.shields.io/github/languages/code-size/XMuli/ChineseChess)  ![](https://img.shields.io/github/downloads/XMuli/ChineseChess/total)
-<br>
+[![macos-badge](https://github.com/xmuli/ChineseChess/workflows/MacOS/badge.svg)](https://github.com/xmuli/ChineseChess/workflows/MacOS/badge.svg)  [![win-badge](https://github.com/xmuli/ChineseChess/workflows/Windows/badge.svg)](https://github.com/xmuli/ChineseChess/workflows/Windows/badge.svg)  [![ubuntu-badge](https://github.com/xmuli/ChineseChess/workflows/Ubuntu/badge.svg)](https://github.com/xmuli/ChineseChess/workflows/Ubuntu/badge.svg)   ![](https://img.shields.io/github/languages/code-size/XMuli/ChineseChess)  ![](https://img.shields.io/github/downloads/XMuli/ChineseChess/total)
+
 
 > The Chinese chess online battle platform (including communication function) developed based on `Qt5` realizes the function of chess game in a single or networked state, no matter whether it is single or multiple players, regardless of whether the system is the same.
 
@@ -109,7 +109,7 @@ REF：
 
 <br>
 
-## Update (2022 v6.0+)
+## Update (2022-2024 v6.x)
 
 ### Features
 

diff --git a/README.zh_CN.md b/README.zh_CN.md
@@ -11,7 +11,7 @@
 
 ![](https://img.shields.io/github/license/XMuli/chineseChess) ![](https://img.shields.io/github/v/release/XMuli/ChineseChess?style=flat&color=birightgreen)![](https://img.shields.io/badge/powered%20by-XMuli-ff69b4)![](https://img.shields.io/github/stars/XMuli/ChineseChess?style=social) ![](https://img.shields.io/github/forks/XMuli/ChineseChess?style=social&label=Fork)
 
-![](https://img.shields.io/github/workflow/status/XMuli/ChineseChess/Windows?style=flat&logo=windows) ![](https://img.shields.io/github/workflow/status/XMuli/ChineseChess/MacOS?style=flat&logo=apple) ![](https://img.shields.io/github/workflow/status/XMuli/ChineseChess/Linux?style=flat&logo=linux) ![](https://img.shields.io/github/languages/code-size/XMuli/ChineseChess)  ![](https://img.shields.io/github/downloads/XMuli/ChineseChess/total)
+[![macos-badge](https://github.com/xmuli/ChineseChess/workflows/MacOS/badge.svg)](https://github.com/xmuli/ChineseChess/workflows/MacOS/badge.svg)  [![win-badge](https://github.com/xmuli/ChineseChess/workflows/Windows/badge.svg)](https://github.com/xmuli/ChineseChess/workflows/Windows/badge.svg)  [![ubuntu-badge](https://github.com/xmuli/ChineseChess/workflows/Ubuntu/badge.svg)](https://github.com/xmuli/ChineseChess/workflows/Ubuntu/badge.svg)   ![](https://img.shields.io/github/languages/code-size/XMuli/ChineseChess)  ![](https://img.shields.io/github/downloads/XMuli/ChineseChess/total)
 <br>
 
 > 基于`Qt5`开发的中国象棋网络对战平台(含通讯功能)，实现了在单机或联网状态下，无论是单人还是多人，无论使用系统是否相同，均可以实现象棋游戏功能。 
@@ -76,7 +76,7 @@
 
 <br>
 
-## 更新(2022 v6.0+)
+## 更新(2022-2024 v6.x)
 
 ### 功能