Update CI to Qt 6.7.0

LithApp · Apr 17, 2024 · 7b23885 · 7b23885
1 parent 9219899
commit 7b23885
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 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.0'
+    QT_VERSION: '6.7.0'
     QT_MODULES: 'qtmultimedia qtwebsockets qtimageformats'
-    EM_VERSION: '3.1.25'
+    EM_VERSION: '3.1.50'
 
 jobs:
   analyze:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,9 +7,9 @@ on:
   create:
 
 env:
-    QT_VERSION: '6.6.0'
+    QT_VERSION: '6.7.0'
     QT_MODULES: 'qtmultimedia qtwebsockets qtimageformats'
-    EM_VERSION: '3.1.25'
+    EM_VERSION: '3.1.50'
 
 permissions:
   contents: write
@@ -29,18 +29,6 @@ jobs:
         security create-keychain -p password build.keychain
         security default-keychain -s ~/Library/Keychains/build.keychain
 
-        base64 -D <<< "${{ secrets.CERT_APPLE_DISTRIBUTION }}" > Apple_Distribution_Z52EFCPL6D.p7b
-        security import ./Apple_Distribution_Z52EFCPL6D.p7b -k ~/Library/Keychains/build.keychain -T /usr/bin/codesign
-
-        base64 -D <<< "${{ secrets.CERT_APPLE_DEVELOPMENT }}" > Apple_Development_N952V7G2F5.p7b
-        security import ./Apple_Development_N952V7G2F5.p7b -k ~/Library/Keychains/build.keychain -T /usr/bin/codesign
-
-        base64 -D <<< "${{ secrets.CERT_IOS_DEVELOPMENT }}" > Ios_Development_N952V7G2F5.p7b
-        security import ./Ios_Development_N952V7G2F5.p7b -k ~/Library/Keychains/build.keychain -T /usr/bin/codesign
-
-        base64 -D <<< "${{ secrets.CERT_IOS_DISTRIBUTION }}" > Ios_Distribution_N952V7G2F5.p7b
-        security import ./Ios_Distribution_N952V7G2F5.p7b -k ~/Library/Keychains/build.keychain -T /usr/bin/codesign
-
         base64 -D <<< "${{ secrets.CERT_APPLE_DISTRIBUTION_P12 }}" > Apple_Distribution_Z52EFCPL6D.p12
         security import ./Apple_Distribution_Z52EFCPL6D.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
 
@@ -144,18 +132,16 @@ jobs:
         host: 'linux'
         version: ${{env.QT_VERSION}}
         set-env: false
-        aqtversion: '==3.1.*'
         modules: ${{env.QT_MODULES}}
         cache: true
         cache-key-prefix: ${{ github.job }}-qt-host
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
-        host: 'linux'
         version: ${{env.QT_VERSION}}
+        host: all_os
         target: android
-        arch: android_armv7
-        aqtversion: '==3.1.*'
+        arch: armv7
         modules: ${{env.QT_MODULES}}
         cache: true
         cache-key-prefix: ${{ github.job }}-qt
@@ -207,18 +193,16 @@ jobs:
       with:
         version: ${{env.QT_VERSION}}
         set-env: false
-        aqtversion: '==3.1.*'
         cache: true
         cache-key-prefix: ${{ github.job }}-qt-host
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
         version: ${{env.QT_VERSION}}
-        host: linux
-        target: desktop
+        host: all_os
+        target: wasm
         arch: wasm_singlethread
         modules: ${{env.QT_MODULES}}
-        aqtversion: '==3.1.*'
         cache: true
         cache-key-prefix: ${{ github.job }}-qt