Skip to content

Commit 435dae5

Browse files
committed
ci: bump Qt to 6.9.3 across all platforms
Update pinned Qt 6.8.3 -> 6.9.3 (latest 6.9.x) on Windows/Linux/macOS/TSan CI, refresh Qt cache keys, and return macOS runner to macos-latest (6.9.3 carries the QTBUG-137687 AGL fix). Docs and pack-win.ps1 updated to match.
1 parent 47e6727 commit 435dae5

6 files changed

Lines changed: 13 additions & 16 deletions

File tree

.github/workflows/ci-linux-tsan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ jobs:
7979
uses: actions/cache@v4
8080
with:
8181
path: ${{runner.workspace}}/Qt
82-
key: ${{ runner.os }}-QtCache-6.8
82+
key: ${{ runner.os }}-QtCache-6.9
8383

8484
- name: Install Qt
8585
uses: jurplel/install-qt-action@v3
8686
with:
87-
version: 6.8.3
87+
version: 6.9.3
8888
target: desktop
8989
modules: 'qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat qtserialport'
9090
tools: 'tools_opensslv3_src'

.github/workflows/ci-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ jobs:
6767
uses: actions/cache@v4
6868
with:
6969
path: ${{runner.workspace}}/Qt
70-
key: ${{ runner.os }}-QtCache-6.8
70+
key: ${{ runner.os }}-QtCache-6.9
7171

7272
- name: Install Qt
7373
uses: jurplel/install-qt-action@v3
7474
with:
75-
version: 6.8.3
75+
version: 6.9.3
7676
target: desktop
7777
modules: 'qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat qtserialport'
7878
tools: 'tools_opensslv3_src'

.github/workflows/ci-macos.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,12 @@ jobs:
3030
matrix:
3131
config:
3232
- name: "Build on Arm64"
33-
# Pinned to macos-15 (not macos-latest): the macos-26/Xcode 26 SDK
34-
# removed AGL.framework, which Qt 6.8.3's bundled
35-
# FindWrapOpenGL.cmake still links unconditionally, breaking the
36-
# libVTextEdit.dylib link ("ld: framework 'AGL' not found").
37-
# Qt fixed this in 6.8.4 / 6.9.2+ (QTBUG-137687); once the pinned Qt
38-
# is bumped past that, this can return to macos-latest.
39-
os: macos-15
33+
# Qt 6.9.3 includes the QTBUG-137687 fix (FindWrapOpenGL.cmake no
34+
# longer unconditionally links the macOS AGL.framework that Xcode 26
35+
# removed), so macos-latest is safe again.
36+
os: macos-latest
4037
arch: universal
41-
qt: 6.8.3
38+
qt: 6.9.3
4239

4340
runs-on: ${{matrix.config.os}}
4441

@@ -92,7 +89,7 @@ jobs:
9289
uses: actions/cache@v4
9390
with:
9491
path: ${{runner.workspace}}/Qt
95-
key: ${{ runner.os }}-QtCache-6.8
92+
key: ${{ runner.os }}-QtCache-6.9
9693

9794
- name: Install Qt
9895
uses: jurplel/install-qt-action@v3

.github/workflows/ci-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
arch: win64_msvc2022_64
3333
vs_version: 2022
3434
vs_cmd: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
35-
qt: 6.8.3
35+
qt: 6.9.3
3636
qt_modules: "qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat"
3737
qt_tools: tools_opensslv3_x64
3838
qt_major: 6

CLAUDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,4 @@ When migrating legacy code to new architecture:
170170

171171
## CI
172172

173-
GitHub Actions workflows in `.github/workflows/`: `ci-win.yml`, `ci-linux.yml`, `ci-macos.yml`. Trigger on push/PR to `master`. Windows builds use Ninja + MSVC 2022 with Qt 6.8.3.
173+
GitHub Actions workflows in `.github/workflows/`: `ci-win.yml`, `ci-linux.yml`, `ci-macos.yml`. Trigger on push/PR to `master`. Windows builds use Ninja + MSVC 2022 with Qt 6.9.3.

scripts/pack-win.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# .\scripts\pack-win.ps1 # auto-detect everything
99
# .\scripts\pack-win.ps1 -Clean # wipe build dir first
1010
# .\scripts\pack-win.ps1 -BuildOnly # build but skip pack
11-
# .\scripts\pack-win.ps1 -QtDir "C:\Qt\6.8.3\msvc2022_64"
11+
# .\scripts\pack-win.ps1 -QtDir "C:\Qt\6.9.3\msvc2022_64"
1212
# .\scripts\pack-win.ps1 -VcVars "...\vcvars64.bat"
1313

1414
param(

0 commit comments

Comments
 (0)