fix: CI/CD

SunnyScreenshot · Jan 25, 2024 · 540cd00 · 540cd00
1 parent b8edb75
commit 540cd00
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -15,14 +15,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest]
-        qt_ver: [5.12.9]
+        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]
     steps:
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2.12.2
+        uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 1
       - name: build macos

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -15,17 +15,20 @@ jobs:
     name: Build
     runs-on: ${{ matrix.os }}
     strategy:
-      matrix:
-        os: [ubuntu-20.04]
-        qt_ver: [5.12.9]
+      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
     steps:
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2.12.2
+        uses: urplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
       - name: ubuntu install GL library
         run: sudo apt-get install -y libglew-dev libglfw3-dev
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 1
       - name: build ubuntu

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -17,25 +17,27 @@ jobs:
   build:
     name: Build
     # 运行平台， windows-latest目前是windows server 2019
+    # https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md
     runs-on: windows-2019
     strategy:
       # 矩阵配置
       matrix:
-        qt_ver: [5.12.9]
-        qt_target: [desktop]
-        # qt_arch: [win64_msvc2017_64, win32_msvc2017, win32_mingw53,win32_mingw73]
-        qt_arch: [win64_msvc2017_64, win32_msvc2017]
         include:
-          - qt_arch: win64_msvc2017_64
+          # 5.15.2 参考 https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/windows_x86/desktop/qt5_51211/            
+          # - 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: win32_msvc2017
-            msvc_arch: x86
+            qt_arch_install: msvc2019_64
     # 步骤
     steps:
       # 安装Qt
       - name: Install Qt
         # 使用外部action。这个action专门用来安装Qt
-        uses: jurplel/install-qt-action@v2.12.2
+        uses: urplel/install-qt-action@v3
         with:
           # Version of Qt to install
           version: ${{ matrix.qt_ver }}
@@ -44,7 +46,7 @@ jobs:
           # Architecture for Windows/Android
           arch: ${{ matrix.qt_arch }}
       # 拉取代码
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 1
       # 编译msvc