Skip to content

Commit f1f1294

Browse files
committed
Update CI to Qt 6.8
1 parent 6955411 commit f1f1294

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
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.0'
2222
QT_MODULES: 'qtmultimedia qtwebsockets qtimageformats'
2323

2424
jobs:

.github/workflows/main.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ on:
77
create:
88

99
env:
10-
QT_VERSION: '6.7.2'
10+
QT_VERSION: '6.8.1'
1111
QT_MODULES: 'qtmultimedia qtwebsockets qtimageformats'
12-
WASM_QT_VERSION: '6.6.3'
13-
EM_VERSION: '3.1.25'
12+
EM_VERSION: '3.1.56'
1413

1514
permissions:
1615
contents: write
@@ -192,18 +191,21 @@ jobs:
192191
- name: Install Host Qt
193192
uses: jurplel/install-qt-action@v4
194193
with:
195-
version: ${{env.WASM_QT_VERSION}}
194+
version: ${{env.QT_VERSION}}
196195
set-env: false
197196
cache: true
198197
cache-key-prefix: ${{ github.job }}-qt-${{ env.QT_VERSION }}
199-
- name: Install Qt
200-
uses: jurplel/install-qt-action@v4
198+
199+
- name: Install Qt (temporary, see https://github.com/miurahr/aqtinstall/pull/846 )
200+
uses: Kidev/[email protected]
201201
with:
202-
version: ${{env.WASM_QT_VERSION}}
203-
host: linux
204-
target: desktop
202+
version: ${{env.QT_VERSION}}
203+
host: all_os
204+
target: wasm
205205
arch: wasm_singlethread
206+
set-env: true
206207
modules: ${{env.QT_MODULES}}
208+
aqtsource: 'git+https://github.com/Kidev/aqtinstall.git@wasm'
207209
cache: true
208210
cache-key-prefix: ${{ github.job }}-qt-cross-${{ env.QT_VERSION }}
209211

@@ -253,6 +255,7 @@ jobs:
253255
with:
254256
version: ${{env.QT_VERSION}}
255257
modules: ${{env.QT_MODULES}}
258+
arch: win64_msvc2022_64
256259
cache: true
257260
cache-key-prefix: ${{ github.job }}-qt
258261

0 commit comments

Comments
 (0)