Update CI to Qt 6.7.2 (except wasm)

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

Hide file tree

Showing 2 changed files with 32 additions and 31 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,8 +7,9 @@ on:
   create:
 
 env:
-    QT_VERSION: '6.6.3'
+    QT_VERSION: '6.7.2'
     QT_MODULES: 'qtmultimedia qtwebsockets qtimageformats'
+    WASM_QT_VERSION: '6.6.3'
     EM_VERSION: '3.1.37'
 
 permissions:
@@ -59,23 +60,23 @@ jobs:
 
     - name: Set up CPM cache
       id: cache-cpm
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/cpm-cache
         key: ${{ runner.os }}-cpm-${{ hashFiles('CMakeLists.txt') }}
         restore-keys: |
           ${{ runner.os }}-cpm-
 
     - name: Install Host Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{env.QT_VERSION}}
         set-env: false
         modules: ${{env.QT_MODULES}} qtquick3d
         cache: true
         cache-key-prefix: ${{ github.job }}-qt-host
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{env.QT_VERSION}}
         target: ios
@@ -90,7 +91,7 @@ jobs:
         IMGUR_API_KEY=${{ secrets.IMGUR_API_KEY }} bash ./dist/ios/build.sh
     - name: Upload artifacts to GitHub
       if: github.event_name != 'create'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Lith.ipa
         path: build_ios/Lith.ipa
@@ -119,32 +120,32 @@ jobs:
 
     - name: Set up CPM cache
       id: cache-cpm
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/cpm-cache
         key: ${{ runner.os }}-cpm-${{ hashFiles('CMakeLists.txt') }}
         restore-keys: |
           ${{ runner.os }}-cpm-
 
     - name: Install Host Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{env.QT_VERSION}}
         host: linux
         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
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{env.QT_VERSION}}
         host: linux
         target: android
         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: |
@@ -160,7 +161,7 @@ jobs:
         IMGUR_API_KEY=${{ secrets.IMGUR_API_KEY }} bash ./dist/android/build.sh
     - name: Upload artifacts to GitHub
       if: github.event_name != 'create'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: android-build-debug.apk
         path: build_android/app/android-build/Lith.apk
@@ -181,30 +182,30 @@ jobs:
 
     - name: Set up CPM cache
       id: cache-cpm
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/cpm-cache
         key: ${{ runner.os }}-cpm-${{ hashFiles('CMakeLists.txt') }}
         restore-keys: |
           ${{ runner.os }}-cpm-
 
     - name: Install Host Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       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
+      uses: jurplel/install-qt-action@v4
       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:
@@ -223,13 +224,13 @@ jobs:
       uses: actions/configure-pages@v3
     - name: Upload artifact
       if: github.event_name == 'create'
-      uses: actions/upload-pages-artifact@v2
+      uses: actions/upload-pages-artifact@v3
       with:
         path: 'installed/'
     - name: Deploy to GitHub Pages
       id: deployment
       if: github.event_name == 'create'
-      uses: actions/deploy-pages@v2
+      uses: actions/deploy-pages@v4
 
   Windows-MSVC:
     runs-on: windows-2019
@@ -240,15 +241,15 @@ jobs:
 
     - name: Set up CPM cache
       id: cache-cpm
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/cpm-cache
         key: ${{ runner.os }}-cpm-${{ hashFiles('CMakeLists.txt') }}
         restore-keys: |
           ${{ runner.os }}-cpm-
 
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{env.QT_VERSION}}
         modules: ${{env.QT_MODULES}}
@@ -280,7 +281,7 @@ jobs:
         7z a ../../Lith.zip *
     - name: Upload artifacts to GitHub
       if: github.event_name != 'create'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Lith.zip
         path: Lith.zip
@@ -308,15 +309,15 @@ jobs:
 
     - name: Set up CPM cache
       id: cache-cpm
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/cpm-cache
         key: ${{ runner.os }}-cpm-${{ hashFiles('CMakeLists.txt') }}
         restore-keys: |
           ${{ runner.os }}-cpm-
 
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{env.QT_VERSION}}
         modules: ${{env.QT_MODULES}}
@@ -350,7 +351,7 @@ jobs:
         manifest-path: "dist/linux/flatpak/app.Lith.Lith.json"
     - name: Upload artifacts to GitHub
       if: github.event_name != 'create'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: app.Lith.Lith.flatpak
         path: app.Lith.Lith.flatpak
@@ -397,15 +398,15 @@ jobs:
 
     - name: Set up CPM cache
       id: cache-cpm
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/cpm-cache
         key: ${{ runner.os }}-cpm-${{ hashFiles('CMakeLists.txt') }}
         restore-keys: |
           ${{ runner.os }}-cpm-
 
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{env.QT_VERSION}}
         modules: ${{env.QT_MODULES}}
@@ -428,7 +429,7 @@ jobs:
         "$Qt6_DIR"/bin/macdeployqt build_macos/app/Lith.app -no-plugins -dmg -always-overwrite -appstore-compliant
     - name: Upload artifacts to GitHub
       if: github.event_name != 'create'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Lith.dmg
         path: build_macos/app/Lith.dmg