Update build.yml

Tencent · Oct 26, 2023 · f835e89 · f835e89
1 parent bdc5b71
commit f835e89
Showing 1 changed file with 26 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -327,7 +327,7 @@ jobs:
           name: tgfx_win_x64
           path: out/release
 
-  qt:
+  linux:
     runs-on: ubuntu-latest
     steps:
       - name: Check Out Repo
@@ -342,8 +342,8 @@ jobs:
           path: |
             third_party
             vendor_tools
-          key: third-party-qt-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }}
-          restore-keys: third-party-qt-
+          key: third-party-linux-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }}
+          restore-keys: third-party-linux-
 
       - uses: seanmiddleditch/gha-setup-ninja@master
 
@@ -353,19 +353,9 @@ jobs:
           depsync
         shell: bash
 
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          host: 'linux'
-          target: 'desktop'
-          dir: '${{github.workspace}}/qt/'
-          install-deps: 'true'
-          cache: 'true'
-          cache-key-prefix: 'install-qt-action'
-
-      - name: Build QT
+      - name: Build Linux
         run: |
-          node build_tgfx -DTGFX_USE_QT=ON -DCMAKE_PREFIX_PATH="${{env.Qt5_Dir}}/lib/cmake/" -p linux
+          node build_tgfx -DTGFX_USE_SWIFTSHADER=ON -p linux
 
       - name: Save Third-Party Cache
         if: ${{ (github.event_name == 'push') && (steps.third-party-cache.outputs.cache-hit != 'true') }}
@@ -374,21 +364,21 @@ jobs:
           path: |
             third_party
             vendor_tools
-          key: third-party-qt-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }}
+          key: third-party-linux-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }}
 
       - name: Job Failed
         if: ${{ failure() }}
         uses: actions/upload-artifact@v3
         with:
-          name: tgfx_qt_x64
+          name: tgfx_linux_x64
           path: out/release
 
       - uses: actions/upload-artifact@v3
         with:
-          name: tgfx_qt_x64
+          name: tgfx_linux_x64
           path: out/release
 
-  linux:
+  qt:
     runs-on: ubuntu-latest
     steps:
       - name: Check Out Repo
@@ -403,8 +393,8 @@ jobs:
           path: |
             third_party
             vendor_tools
-          key: third-party-linux-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }}
-          restore-keys: third-party-linux-
+          key: third-party-qt-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }}
+          restore-keys: third-party-qt-
 
       - uses: seanmiddleditch/gha-setup-ninja@master
 
@@ -414,9 +404,19 @@ jobs:
           depsync
         shell: bash
 
-      - name: Build Linux
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          host: 'linux'
+          target: 'desktop'
+          dir: '${{github.workspace}}/qt/'
+          install-deps: 'true'
+          cache: 'true'
+          cache-key-prefix: 'install-qt-action'
+
+      - name: Build QT
         run: |
-          node build_tgfx -DTGFX_USE_SWIFTSHADER=ON -p linux
+          node build_tgfx -DTGFX_USE_QT=ON -DCMAKE_PREFIX_PATH="${{env.Qt5_Dir}}/lib/cmake/" -p linux
 
       - name: Save Third-Party Cache
         if: ${{ (github.event_name == 'push') && (steps.third-party-cache.outputs.cache-hit != 'true') }}
@@ -425,16 +425,16 @@ jobs:
           path: |
             third_party
             vendor_tools
-          key: third-party-linux-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }}
+          key: third-party-qt-${{ hashFiles('DEPS') }}-${{ hashFiles('vendor.json') }}-${{ hashFiles('test/baseline/version.json') }}
 
       - name: Job Failed
         if: ${{ failure() }}
         uses: actions/upload-artifact@v3
         with:
-          name: tgfx_linux_x64
+          name: tgfx_qt_x64
           path: out/release
 
       - uses: actions/upload-artifact@v3
         with:
-          name: tgfx_linux_x64
+          name: tgfx_qt_x64
           path: out/release