From bdcd03e0b99b5615a3f32ceb7479c3a743c26c0e Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Sat, 11 Jul 2026 10:29:35 +0100 Subject: [PATCH 1/5] ci: bump to 6.12-beta1 --- .github/workflows/build-sanitizers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-sanitizers.yml b/.github/workflows/build-sanitizers.yml index a2472168..150f211c 100644 --- a/.github/workflows/build-sanitizers.yml +++ b/.github/workflows/build-sanitizers.yml @@ -37,7 +37,7 @@ jobs: - name: Setup Sanitized Qt uses: KDABLabs/sanitized-qt-action@v1 with: - qt-tag: "v6.11.0-beta2" + qt-tag: "v6.12.0-beta1" qt-flavor: ${{ matrix.qt-flavor }} - name: Configure project From 8ecaf245312acde8397a8996fb8b1a73da372e54 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Sat, 11 Jul 2026 10:36:21 +0100 Subject: [PATCH 2/5] ci: Fix macOS build regarding AGL not found This has been fixed in more recent Qt --- .github/workflows/build-external-graphviz.yml | 2 +- .github/workflows/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-external-graphviz.yml b/.github/workflows/build-external-graphviz.yml index 1d14cba3..3e6ae00f 100644 --- a/.github/workflows/build-external-graphviz.yml +++ b/.github/workflows/build-external-graphviz.yml @@ -27,7 +27,7 @@ jobs: - Shared - Static config: - - qt_version: 6.6.2 + - qt_version: 6.9.3 qt_modules: qtscxml qtremoteobjects steps: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6467f0bb..c44cdeb9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: - Shared - Static config: - - qt_version: 6.6.2 + - qt_version: 6.9.3 qt_modules: qtscxml qtremoteobjects qt_arch: win64_msvc2019_64 macos_architectures: "x86_64;arm64" From fc59d561d10964ee04260c145b6b3305b1091567 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Sat, 11 Jul 2026 10:36:51 +0100 Subject: [PATCH 3/5] ci: Remove unneeded 6.10 coverage build-sanitizers.yml covers latest Qt, which we'll bump frequently. --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c44cdeb9..148e2276 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,10 +33,6 @@ jobs: qt_modules: qtscxml qtremoteobjects qt_arch: win64_msvc2019_64 macos_architectures: "x86_64;arm64" - - qt_version: 6.10.0 # Bump to latest freely - qt_modules: qtscxml qtremoteobjects - qt_arch: win64_msvc2022_64 - macos_architectures: "x86_64;arm64" steps: - name: Install Dependencies on Linux if: ${{ runner.os == 'Linux' }} From 3f24a34a877d89244c1f2dd66c5fedf8e7d683c7 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Sat, 11 Jul 2026 11:31:11 +0100 Subject: [PATCH 4/5] ci: use default msvc value from aqtinstall less trouble needing to update it when bumping Qt. 6.8 doesn't ship with 2019 anymore --- .github/workflows/build.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 148e2276..f8da7970 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,6 @@ jobs: config: - qt_version: 6.9.3 qt_modules: qtscxml qtremoteobjects - qt_arch: win64_msvc2019_64 macos_architectures: "x86_64;arm64" steps: - name: Install Dependencies on Linux @@ -45,7 +44,6 @@ jobs: run: brew install bison - name: Install Qt ${{ matrix.config.qt_version }} with options and default aqtversion (Linux/macOS) - if: ${{ runner.os != 'Windows' }} uses: jurplel/install-qt-action@v4 with: aqtversion: null # use whatever the default is @@ -53,16 +51,6 @@ jobs: version: ${{ matrix.config.qt_version }} cache: true - - name: Install Qt with options and default aqtversion (Windows) - if: ${{ runner.os == 'Windows' }} - uses: jurplel/install-qt-action@v4 - with: - aqtversion: null # use whatever the default is - modules: ${{ matrix.config.qt_modules }} - version: ${{ matrix.config.qt_version }} - arch: ${{ matrix.config.qt_arch }} - cache: true - - name: Install ninja-build tool (must be after Qt due PATH changes) uses: turtlesec-no/get-ninja@main From 885e3694f7dcb19254abfa3eaa330e12e946392d Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Sat, 11 Jul 2026 14:24:28 +0100 Subject: [PATCH 5/5] ci: Install wayland, it's a required build dependency of our Qt 6.12 Not needed at runtime though. --- .github/workflows/build-sanitizers.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-sanitizers.yml b/.github/workflows/build-sanitizers.yml index 150f211c..6e314de0 100644 --- a/.github/workflows/build-sanitizers.yml +++ b/.github/workflows/build-sanitizers.yml @@ -40,6 +40,10 @@ jobs: qt-tag: "v6.12.0-beta1" qt-flavor: ${{ matrix.qt-flavor }} + - name: Install dependencies + run: | + sudo apt install libwayland-dev wayland-protocols -y + - name: Configure project run: > cmake --preset=${{ matrix.preset }}