Update CI to Qt 6.7.2 (except wasm)

LithApp · Jul 2, 2024 · e342590 · e342590
1 parent 21b12e0
commit e342590
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -18,9 +18,9 @@ on:
     branches: [ "master" ]
 
 env:
-    QT_VERSION: '6.6.3'
+    QT_VERSION: '6.7.2'
     QT_MODULES: 'qtmultimedia qtwebsockets qtimageformats'
-    EM_VERSION: '3.1.37'
+    EM_VERSION: '3.1.50'
 
 jobs:
   analyze:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,9 +7,10 @@ on:
   create:
 
 env:
-    QT_VERSION: '6.6.3'
+    QT_VERSION: '6.7.2'
     QT_MODULES: 'qtmultimedia qtwebsockets qtimageformats'
-    EM_VERSION: '3.1.37'
+    WASM_QT_VERSION: '6.6.3'
+    EM_VERSION: '3.1.50'
 
 permissions:
   contents: write
@@ -134,7 +135,7 @@ jobs:
         set-env: false
         modules: ${{env.QT_MODULES}}
         cache: true
-        cache-key-prefix: ${{ github.job }}-qt-host
+        cache-key-prefix: ${{ github.job }}-qt-${{ env.QT_VERSION }}
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
@@ -144,7 +145,7 @@ jobs:
         arch: android_armv7
         modules: ${{env.QT_MODULES}}
         cache: true
-        cache-key-prefix: ${{ github.job }}-qt
+        cache-key-prefix: ${{ github.job }}-qt-cross-${{ env.QT_VERSION }}
 
     - name: Get OpenSSL
       run: |
@@ -191,20 +192,20 @@ jobs:
     - name: Install Host Qt
       uses: jurplel/install-qt-action@v3
       with:
-        version: ${{env.QT_VERSION}}
+        version: ${{env.WASM_QT_VERSION}}
         set-env: false
         cache: true
-        cache-key-prefix: ${{ github.job }}-qt-host
+        cache-key-prefix: ${{ github.job }}-qt-${{ env.QT_VERSION }}
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
-        version: ${{env.QT_VERSION}}
+        version: ${{env.WASM_QT_VERSION}}
         host: linux
         target: desktop
         arch: wasm_singlethread
         modules: ${{env.QT_MODULES}}
         cache: true
-        cache-key-prefix: ${{ github.job }}-qt
+        cache-key-prefix: ${{ github.job }}-qt-cross-${{ env.QT_VERSION }}
 
     - uses: mymindstorm/setup-emsdk@v11
       with: