完善workflow的qt安装

czyt1988 · Dec 29, 2024 · ea823ba · ea823ba
1 parent f8e0f67
commit ea823ba
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 16 deletions.
diff --git a/.github/workflows/cmake-mac-qt5.12.yml b/.github/workflows/cmake-mac-qt5.12.yml
@@ -18,6 +18,9 @@ jobs:
         shared: [ON]
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:

diff --git a/.github/workflows/cmake-mac-qt5.14.yml b/.github/workflows/cmake-mac-qt5.14.yml
@@ -19,15 +19,17 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
             version: ${{ matrix.qt_version }}
-            cache: 'true'
+            cache: 'false'
             cache-key-prefix: ${{ runner.os }}-Qt-Cache-${{ matrix.qt_version }}
             dir: ${{ github.workspace }}/Qt
+            host: 'mac'
+            arch: 'clang_64'
 
       - name: Configure CMake
         run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -DBUILD_EXAMPLES=OFF -B "${{github.workspace}}/build"

diff --git a/.github/workflows/cmake-mac-qt5.15.yml b/.github/workflows/cmake-mac-qt5.15.yml
@@ -19,15 +19,17 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
             version: ${{ matrix.qt_version }}
-            cache: 'true'
+            cache: 'false'
             cache-key-prefix: ${{ runner.os }}-Qt-Cache-${{ matrix.qt_version }}
             dir: ${{ github.workspace }}/Qt
+            host: 'mac'
+            arch: 'clang_64'
 
       - name: Configure CMake
         run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -DBUILD_EXAMPLES=OFF -B "${{github.workspace}}/build"

diff --git a/.github/workflows/cmake-mac-qt6.2.yml b/.github/workflows/cmake-mac-qt6.2.yml
@@ -19,15 +19,17 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
             version: ${{ matrix.qt_version }}
-            cache: 'true'
+            cache: 'false'
             cache-key-prefix: ${{ runner.os }}-Qt-Cache-${{ matrix.qt_version }}
             dir: ${{ github.workspace }}/Qt
+            host: 'mac'
+            arch: 'clang_64'
 
       - name: Configure CMake
         run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -DBUILD_EXAMPLES=OFF -B "${{github.workspace}}/build"

diff --git a/.github/workflows/cmake-mac-qt6.5.yml b/.github/workflows/cmake-mac-qt6.5.yml
@@ -19,15 +19,17 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
             version: ${{ matrix.qt_version }}
             cache: 'true'
             cache-key-prefix: ${{ runner.os }}-Qt-Cache-${{ matrix.qt_version }}
             dir: ${{ github.workspace }}/Qt
+            host: 'mac'
+            arch: 'clang_64'
 
       - name: Configure CMake
         run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -DBUILD_EXAMPLES=OFF -B "${{github.workspace}}/build"

diff --git a/.github/workflows/cmake-mac-qt6.8.yml b/.github/workflows/cmake-mac-qt6.8.yml
@@ -19,15 +19,17 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
             version: ${{ matrix.qt_version }}
             cache: 'true'
             cache-key-prefix: ${{ runner.os }}-Qt-Cache-${{ matrix.qt_version }}
             dir: ${{ github.workspace }}/Qt
+            host: 'mac'
+            arch: 'clang_64'
 
       - name: Configure CMake
         run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -DBUILD_EXAMPLES=OFF -B "${{github.workspace}}/build"

diff --git a/.github/workflows/cmake-win-qt6.2.yml b/.github/workflows/cmake-win-qt6.2.yml
@@ -28,6 +28,8 @@ jobs:
             cache: 'true'
             cache-key-prefix: ${{ runner.os }}-Qt-Cache-${{ matrix.qt_version }}
             dir: ${{ github.workspace }}/Qt
+            host: 'windows'
+            arch: 'win64_msvc2019_64'
 
       - name: Configure CMake
         run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -DBUILD_EXAMPLES=OFF -B "${{github.workspace}}/build"

diff --git a/.github/workflows/cmake-win-qt6.5.yml b/.github/workflows/cmake-win-qt6.5.yml
@@ -28,6 +28,8 @@ jobs:
             cache: 'true'
             cache-key-prefix: ${{ runner.os }}-Qt-Cache-${{ matrix.qt_version }}
             dir: ${{ github.workspace }}/Qt
+            host: 'windows'
+            arch: 'win64_msvc2019_64'
 
       - name: Configure CMake
         run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -DBUILD_EXAMPLES=OFF -B "${{github.workspace}}/build"

diff --git a/.github/workflows/cmake-win-qt6.8.yml b/.github/workflows/cmake-win-qt6.8.yml
@@ -19,15 +19,17 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
             version: ${{ matrix.qt_version }}
-            cache: 'true'
+            cache: 'false'
             cache-key-prefix: ${{ runner.os }}-Qt-Cache-${{ matrix.qt_version }}
             dir: ${{ github.workspace }}/Qt
+            host: 'windows'
+            arch: 'win64_msvc2022_64'
 
       - name: Configure CMake
         run: cmake -DCMAKE_BUILD_TYPE="${{env.BUILD_TYPE}}" -DBUILD_SHARED_LIBS=${{ matrix.shared }} -DBUILD_EXAMPLES=OFF -B "${{github.workspace}}/build"