Skip to content

Commit 84a832b

Browse files
MartinBrizaMartinBriza
committed
Update CI to Qt 6.8
1 parent 6955411 commit 84a832b

File tree

2 files changed

+59
-31
lines changed

2 files changed

+59
-31
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
branches: [ "master" ]
1919

2020
env:
21-
QT_VERSION: '6.7.2'
21+
QT_VERSION: '6.8.1'
2222
QT_MODULES: 'qtmultimedia qtwebsockets qtimageformats'
2323

2424
jobs:

‎.github/workflows/main.yml‎

Lines changed: 58 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ on:
44
push:
55
branches:
66
- '**'
7+
pull_request:
8+
# The branches below must be a subset of the branches above
9+
branches: [ "master" ]
710
create:
811

912
env:
10-
QT_VERSION: '6.7.2'
13+
QT_VERSION: '6.8.1'
1114
QT_MODULES: 'qtmultimedia qtwebsockets qtimageformats'
12-
WASM_QT_VERSION: '6.6.3'
13-
EM_VERSION: '3.1.25'
15+
EM_VERSION: '3.1.56'
1416

1517
permissions:
1618
contents: write
@@ -30,20 +32,30 @@ jobs:
3032
security create-keychain -p password build.keychain
3133
security default-keychain -s ~/Library/Keychains/build.keychain
3234
33-
base64 -D <<< "${{ secrets.CERT_APPLE_DISTRIBUTION_P12 }}" > Apple_Distribution_Z52EFCPL6D.p12
34-
security import ./Apple_Distribution_Z52EFCPL6D.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
35+
if [ ! -z "${{ secrets.CERT_APPLE_DISTRIBUTION_P12 }}" ]; then
36+
base64 -D <<< "${{ secrets.CERT_APPLE_DISTRIBUTION_P12 }}" > Apple_Distribution_Z52EFCPL6D.p12
37+
security import ./Apple_Distribution_Z52EFCPL6D.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
38+
fi
3539
36-
base64 -D <<< "${{ secrets.CERT_APPLE_DEVELOPMENT_P12 }}" > Apple_Development_N952V7G2F5.p12
37-
security import ./Apple_Development_N952V7G2F5.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
40+
if [ ! -z "${{ secrets.CERT_APPLE_DEVELOPMENT_P12 }}" ]; then
41+
base64 -D <<< "${{ secrets.CERT_APPLE_DEVELOPMENT_P12 }}" > Apple_Development_N952V7G2F5.p12
42+
security import ./Apple_Development_N952V7G2F5.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
43+
fi
3844
39-
base64 -D <<< "${{ secrets.CERT_IOS_DEVELOPMENT_P12 }}" > Ios_Development_N952V7G2F5.p12
40-
security import ./Ios_Development_N952V7G2F5.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
45+
if [ ! -z "${{ secrets.CERT_IOS_DEVELOPMENT_P12 }}" ]; then
46+
base64 -D <<< "${{ secrets.CERT_IOS_DEVELOPMENT_P12 }}" > Ios_Development_N952V7G2F5.p12
47+
security import ./Ios_Development_N952V7G2F5.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
48+
fi
4149
42-
base64 -D <<< "${{ secrets.CERT_IOS_DISTRIBUTION_P12 }}" > Ios_Distribution_N952V7G2F5.p12
43-
security import ./Ios_Distribution_N952V7G2F5.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
50+
if [ ! -z "${{ secrets.CERT_IOS_DISTRIBUTION_P12 }}" ]; then
51+
base64 -D <<< "${{ secrets.CERT_IOS_DISTRIBUTION_P12 }}" > Ios_Distribution_N952V7G2F5.p12
52+
security import ./Ios_Distribution_N952V7G2F5.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
53+
fi
4454
45-
base64 -D <<< "${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}" > Developer_ID_Application_Z52EFCPL6D.p7b
46-
security import ./Developer_ID_Application_Z52EFCPL6D.p7b -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
55+
if [ ! -z "${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}" ]; then
56+
base64 -D <<< "${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}" > Developer_ID_Application_Z52EFCPL6D.p7b
57+
security import ./Developer_ID_Application_Z52EFCPL6D.p7b -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
58+
fi
4759
4860
# Unlock
4961
security unlock-keychain -p password ~/Library/Keychains/build.keychain
@@ -192,27 +204,32 @@ jobs:
192204
- name: Install Host Qt
193205
uses: jurplel/install-qt-action@v4
194206
with:
195-
version: ${{env.WASM_QT_VERSION}}
207+
version: ${{env.QT_VERSION}}
196208
set-env: false
197209
cache: true
198210
cache-key-prefix: ${{ github.job }}-qt-${{ env.QT_VERSION }}
199-
- name: Install Qt
200-
uses: jurplel/install-qt-action@v4
211+
212+
- name: Install Qt (temporary, see https://github.com/miurahr/aqtinstall/pull/846 )
213+
uses: Kidev/[email protected]
201214
with:
202-
version: ${{env.WASM_QT_VERSION}}
203-
host: linux
204-
target: desktop
215+
version: ${{env.QT_VERSION}}
216+
host: all_os
217+
target: wasm
205218
arch: wasm_singlethread
219+
set-env: true
206220
modules: ${{env.QT_MODULES}}
221+
aqtsource: 'git+https://github.com/Kidev/aqtinstall.git@wasm'
207222
cache: true
208-
cache-key-prefix: ${{ github.job }}-qt-cross-${{ env.QT_VERSION }}
223+
cache-key-prefix: ${{ github.job }}-qt-wasm-${{ env.QT_VERSION }}
209224

210225
- uses: mymindstorm/setup-emsdk@v14
211226
with:
212227
version: ${{env.EM_VERSION}}
213228

214229
- name: Build the Emscripten binary
215230
run: |
231+
#hack
232+
export QT_ROOT_DIR=${QT_ROOT_DIR}/../wasm_singlethread
216233
IMGUR_API_KEY=${{ secrets.IMGUR_API_KEY }} bash ./dist/wasm/build.sh
217234
mkdir installed
218235
cp build_wasm/app/*.js build_wasm/app/*.html build_wasm/app/*.wasm build_wasm/app/*.svg installed
@@ -253,6 +270,7 @@ jobs:
253270
with:
254271
version: ${{env.QT_VERSION}}
255272
modules: ${{env.QT_MODULES}}
273+
arch: win64_msvc2022_64
256274
cache: true
257275
cache-key-prefix: ${{ github.job }}-qt
258276

@@ -372,20 +390,30 @@ jobs:
372390
security create-keychain -p password build.keychain
373391
security default-keychain -s ~/Library/Keychains/build.keychain
374392
375-
base64 -D <<< "${{ secrets.CERT_APPLE_DISTRIBUTION }}" > Apple_Distribution_Z52EFCPL6D.p7b
376-
security import ./Apple_Distribution_Z52EFCPL6D.p7b -k ~/Library/Keychains/build.keychain -T /usr/bin/codesign
393+
if [ ! -z "${{ secrets.CERT_APPLE_DISTRIBUTION }}" ]; then
394+
base64 -D <<< "${{ secrets.CERT_APPLE_DISTRIBUTION }}" > Apple_Distribution_Z52EFCPL6D.p7b
395+
security import ./Apple_Distribution_Z52EFCPL6D.p7b -k ~/Library/Keychains/build.keychain -T /usr/bin/codesign
396+
fi
377397
378-
base64 -D <<< "${{ secrets.CERT_APPLE_DEVELOPMENT }}" > Apple_Development_N952V7G2F5.p7b
379-
security import ./Apple_Development_N952V7G2F5.p7b -k ~/Library/Keychains/build.keychain -T /usr/bin/codesign
398+
if [ ! -z "${{ secrets.CERT_APPLE_DEVELOPMENT }}" ]; then
399+
base64 -D <<< "${{ secrets.CERT_APPLE_DEVELOPMENT }}" > Apple_Development_N952V7G2F5.p7b
400+
security import ./Apple_Development_N952V7G2F5.p7b -k ~/Library/Keychains/build.keychain -T /usr/bin/codesign
401+
fi
380402
381-
base64 -D <<< "${{ secrets.CERT_APPLE_DISTRIBUTION_P12 }}" > Apple_Distribution_Z52EFCPL6D.p12
382-
security import ./Apple_Distribution_Z52EFCPL6D.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
403+
if [ ! -z "${{ secrets.CERT_APPLE_DISTRIBUTION_P12 }}" ]; then
404+
base64 -D <<< "${{ secrets.CERT_APPLE_DISTRIBUTION_P12 }}" > Apple_Distribution_Z52EFCPL6D.p12
405+
security import ./Apple_Distribution_Z52EFCPL6D.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
406+
fi
383407
384-
base64 -D <<< "${{ secrets.CERT_APPLE_DEVELOPMENT_P12 }}" > Apple_Development_N952V7G2F5.p12
385-
security import ./Apple_Development_N952V7G2F5.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
408+
if [ ! -z "${{ secrets.CERT_APPLE_DEVELOPMENT_P12 }}" ]; then
409+
base64 -D <<< "${{ secrets.CERT_APPLE_DEVELOPMENT_P12 }}" > Apple_Development_N952V7G2F5.p12
410+
security import ./Apple_Development_N952V7G2F5.p12 -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
411+
fi
386412
387-
base64 -D <<< "${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}" > Developer_ID_Application_Z52EFCPL6D.p7b
388-
security import ./Developer_ID_Application_Z52EFCPL6D.p7b -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
413+
if [ ! -z "${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}" ]; then
414+
base64 -D <<< "${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}" > Developer_ID_Application_Z52EFCPL6D.p7b
415+
security import ./Developer_ID_Application_Z52EFCPL6D.p7b -k ~/Library/Keychains/build.keychain -P heslo -T /usr/bin/codesign
416+
fi
389417
390418
# Unlock
391419
security unlock-keychain -p password ~/Library/Keychains/build.keychain

0 commit comments

Comments
 (0)