Skip to content

Commit 38c2086

Browse files
c3dc3d
committed
CI: update to Qt 6.9.2 and macOS 26
We were running on Qt 6.8.4 with AGL, which was available on macOS15 runners. However, with macOS 26, that option is gone. Switch to Qt 6.9.2 for compatibility wiht macOS 26. Signed-off-by: Christophe de Dinechin <christophe@dinechin.org>
1 parent 21a222d commit 38c2086

2 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Install Qt
3131
uses: jurplel/install-qt-action@v4
3232
with:
33-
version: '6.8.3'
33+
version: '6.9.2'
3434
host: 'mac'
3535
target: 'desktop'
3636
arch: 'clang_64'
@@ -94,7 +94,7 @@ jobs:
9494
- name: Install Qt
9595
uses: jurplel/install-qt-action@v4
9696
with:
97-
version: '6.8.3'
97+
version: '6.9.2'
9898
host: 'linux'
9999
target: 'desktop'
100100
modules: 'qtmultimedia'
@@ -142,9 +142,9 @@ jobs:
142142
pkgconfig xcb-util-wm-devel xcb-util-image-devel \
143143
xcb-util-keysyms-devel xcb-util-renderutil-devel
144144
python3 -m pip install aqtinstall
145-
python3 -m aqt install-qt linux desktop 6.8.3 --outputdir /opt/Qt \
145+
python3 -m aqt install-qt linux desktop 6.9.2 --outputdir /opt/Qt \
146146
--modules qtmultimedia
147-
echo "/opt/Qt/6.8.3/gcc_64/bin" >> "$GITHUB_PATH"
147+
echo "/opt/Qt/6.9.2/gcc_64/bin" >> "$GITHUB_PATH"
148148
149149
- name: Build simulator
150150
run: |
@@ -186,9 +186,9 @@ jobs:
186186
libpulse fontconfig libxcb mesa libxkbcommon-x11 freetype2 pkgconf \
187187
xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil
188188
python -m pip install --break-system-packages aqtinstall
189-
python -m aqt install-qt linux desktop 6.8.3 --outputdir /opt/Qt \
189+
python -m aqt install-qt linux desktop 6.9.2 --outputdir /opt/Qt \
190190
--modules qtmultimedia
191-
echo "/opt/Qt/6.8.3/gcc_64/bin" >> "$GITHUB_PATH"
191+
echo "/opt/Qt/6.9.2/gcc_64/bin" >> "$GITHUB_PATH"
192192
193193
- name: Build simulator
194194
run: |
@@ -315,7 +315,7 @@ jobs:
315315
- name: Install Qt
316316
uses: jurplel/install-qt-action@v4
317317
with:
318-
version: '6.8.3'
318+
version: '6.9.2'
319319
host: 'mac'
320320
target: 'desktop'
321321
arch: 'clang_64'
@@ -379,7 +379,7 @@ jobs:
379379
- name: Install Qt
380380
uses: jurplel/install-qt-action@v4
381381
with:
382-
version: '6.8.3'
382+
version: '6.9.2'
383383
host: 'linux'
384384
target: 'desktop'
385385
modules: 'qtmultimedia'
@@ -427,9 +427,9 @@ jobs:
427427
pkgconfig xcb-util-wm-devel xcb-util-image-devel \
428428
xcb-util-keysyms-devel xcb-util-renderutil-devel
429429
python3 -m pip install aqtinstall
430-
python3 -m aqt install-qt linux desktop 6.8.3 --outputdir /opt/Qt \
430+
python3 -m aqt install-qt linux desktop 6.9.2 --outputdir /opt/Qt \
431431
--modules qtmultimedia
432-
echo "/opt/Qt/6.8.3/gcc_64/bin" >> "$GITHUB_PATH"
432+
echo "/opt/Qt/6.9.2/gcc_64/bin" >> "$GITHUB_PATH"
433433
434434
- name: Build color DM32 simulator
435435
run: |
@@ -471,9 +471,9 @@ jobs:
471471
libpulse fontconfig libxcb mesa libxkbcommon-x11 freetype2 pkgconf \
472472
xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil
473473
python -m pip install --break-system-packages aqtinstall
474-
python -m aqt install-qt linux desktop 6.8.3 --outputdir /opt/Qt \
474+
python -m aqt install-qt linux desktop 6.9.2 --outputdir /opt/Qt \
475475
--modules qtmultimedia
476-
echo "/opt/Qt/6.8.3/gcc_64/bin" >> "$GITHUB_PATH"
476+
echo "/opt/Qt/6.9.2/gcc_64/bin" >> "$GITHUB_PATH"
477477
478478
- name: Build color DM32 simulator
479479
run: |
@@ -651,7 +651,7 @@ jobs:
651651
- name: Install Qt for Android
652652
uses: jurplel/install-qt-action@v4
653653
with:
654-
version: '6.8.3'
654+
version: '6.9.2'
655655
host: 'linux'
656656
target: 'android'
657657
arch: 'android_arm64_v8a'
@@ -722,7 +722,7 @@ jobs:
722722
- name: Install Qt for Android
723723
uses: jurplel/install-qt-action@v4
724724
with:
725-
version: '6.8.3'
725+
version: '6.9.2'
726726
host: 'linux'
727727
target: 'android'
728728
arch: 'android_arm64_v8a'

‎.gitlab-ci.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ build-simulator-linux:
9999
before_script:
100100
- dnf install -y gcc gcc-c++ make which git python3 python3-pip glib2 dbus-devel pulseaudio-libs-devel libxcb-devel mesa-libGL-devel libxkbcommon-x11-devel freetype-devel pkgconfig xcb-util-wm-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
101101
- python3 -m pip install aqtinstall
102-
- python3 -m aqt install-qt linux desktop 6.8.3 --outputdir /opt/Qt --modules qtmultimedia
103-
- export PATH="/opt/Qt/6.8.3/gcc_64/bin:$PATH"
102+
- python3 -m aqt install-qt linux desktop 6.9.2 --outputdir /opt/Qt --modules qtmultimedia
103+
- export PATH="/opt/Qt/6.9.2/gcc_64/bin:$PATH"
104104
- export QT_QPA_PLATFORM=offscreen
105105
script:
106106
- echo "$CI_PIPELINE_IID" > .build_id
@@ -118,8 +118,8 @@ build-color-simulator-linux:
118118
before_script:
119119
- dnf install -y gcc gcc-c++ make which git python3 python3-pip glib2 dbus-devel pulseaudio-libs-devel libxcb-devel mesa-libGL-devel libxkbcommon-x11-devel freetype-devel pkgconfig xcb-util-wm-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
120120
- python3 -m pip install aqtinstall
121-
- python3 -m aqt install-qt linux desktop 6.8.3 --outputdir /opt/Qt --modules qtmultimedia
122-
- export PATH="/opt/Qt/6.8.3/gcc_64/bin:$PATH"
121+
- python3 -m aqt install-qt linux desktop 6.9.2 --outputdir /opt/Qt --modules qtmultimedia
122+
- export PATH="/opt/Qt/6.9.2/gcc_64/bin:$PATH"
123123
- export QT_QPA_PLATFORM=offscreen
124124
script:
125125
- echo "$CI_PIPELINE_IID" > .build_id
@@ -140,8 +140,8 @@ build-simulator-linux-ubuntu:
140140
- apt-get install -y build-essential git python3 python3-pip python3-venv
141141
- apt-get install -y libxcb-cursor0 libgl1-mesa-dev libxkbcommon-x11-0 libglib2.0-0 libdbus-1-dev libpulse-dev libfreetype6-dev pkg-config
142142
- python3 -m pip install aqtinstall --break-system-packages
143-
- python3 -m aqt install-qt linux desktop 6.8.3 --outputdir /opt/Qt --modules qtmultimedia
144-
- export PATH="/opt/Qt/6.8.3/gcc_64/bin:$PATH"
143+
- python3 -m aqt install-qt linux desktop 6.9.2 --outputdir /opt/Qt --modules qtmultimedia
144+
- export PATH="/opt/Qt/6.9.2/gcc_64/bin:$PATH"
145145
- export QT_QPA_PLATFORM=offscreen
146146
script:
147147
- echo "$CI_PIPELINE_IID" > .build_id
@@ -161,8 +161,8 @@ build-color-simulator-linux-ubuntu:
161161
- apt-get install -y build-essential git python3 python3-pip python3-venv
162162
- apt-get install -y libxcb-cursor0 libgl1-mesa-dev libxkbcommon-x11-0 libglib2.0-0 libdbus-1-dev libpulse-dev libfreetype6-dev pkg-config
163163
- python3 -m pip install aqtinstall --break-system-packages
164-
- python3 -m aqt install-qt linux desktop 6.8.3 --outputdir /opt/Qt --modules qtmultimedia
165-
- export PATH="/opt/Qt/6.8.3/gcc_64/bin:$PATH"
164+
- python3 -m aqt install-qt linux desktop 6.9.2 --outputdir /opt/Qt --modules qtmultimedia
165+
- export PATH="/opt/Qt/6.9.2/gcc_64/bin:$PATH"
166166
- export QT_QPA_PLATFORM=offscreen
167167
script:
168168
- echo "$CI_PIPELINE_IID" > .build_id
@@ -359,11 +359,11 @@ build-android:
359359
- sdkmanager --install "ndk;26.1.10909125" "platforms;android-35" "build-tools;35.0.0"
360360
- export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/26.1.10909125
361361
- python3 -m pip install aqtinstall
362-
- python3 -m aqt install-qt linux android 6.8.3 android_arm64_v8a --outputdir $HOME/Qt --modules qtmultimedia
363-
- python3 -m aqt install-qt linux desktop 6.8.3 --outputdir $HOME/Qt --modules qtmultimedia
364-
- export Qt6_DIR=$HOME/Qt/6.8.3/android_arm64_v8a
365-
- export QT_HOST_PATH=$HOME/Qt/6.8.3/gcc_64
366-
- export ANDROID_QT_BASE=$HOME/Qt/6.8.3
362+
- python3 -m aqt install-qt linux android 6.9.2 android_arm64_v8a --outputdir $HOME/Qt --modules qtmultimedia
363+
- python3 -m aqt install-qt linux desktop 6.9.2 --outputdir $HOME/Qt --modules qtmultimedia
364+
- export Qt6_DIR=$HOME/Qt/6.9.2/android_arm64_v8a
365+
- export QT_HOST_PATH=$HOME/Qt/6.9.2/gcc_64
366+
- export ANDROID_QT_BASE=$HOME/Qt/6.9.2
367367
script:
368368
- echo "$CI_PIPELINE_IID" > .build_id
369369
- |
@@ -400,11 +400,11 @@ build-color-android:
400400
- sdkmanager --install "ndk;26.1.10909125" "platforms;android-35" "build-tools;35.0.0"
401401
- export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/26.1.10909125
402402
- python3 -m pip install aqtinstall
403-
- python3 -m aqt install-qt linux android 6.8.3 android_arm64_v8a --outputdir $HOME/Qt --modules qtmultimedia
404-
- python3 -m aqt install-qt linux desktop 6.8.3 --outputdir $HOME/Qt --modules qtmultimedia
405-
- export Qt6_DIR=$HOME/Qt/6.8.3/android_arm64_v8a
406-
- export QT_HOST_PATH=$HOME/Qt/6.8.3/gcc_64
407-
- export ANDROID_QT_BASE=$HOME/Qt/6.8.3
403+
- python3 -m aqt install-qt linux android 6.9.2 android_arm64_v8a --outputdir $HOME/Qt --modules qtmultimedia
404+
- python3 -m aqt install-qt linux desktop 6.9.2 --outputdir $HOME/Qt --modules qtmultimedia
405+
- export Qt6_DIR=$HOME/Qt/6.9.2/android_arm64_v8a
406+
- export QT_HOST_PATH=$HOME/Qt/6.9.2/gcc_64
407+
- export ANDROID_QT_BASE=$HOME/Qt/6.9.2
408408
script:
409409
- echo "$CI_PIPELINE_IID" > .build_id
410410
- |
@@ -440,11 +440,11 @@ build-android-ubuntu:
440440
- sdkmanager --install "ndk;26.1.10909125" "platforms;android-35" "build-tools;35.0.0"
441441
- export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/26.1.10909125
442442
- python3 -m pip install aqtinstall --break-system-packages
443-
- python3 -m aqt install-qt linux android 6.8.3 android_arm64_v8a --outputdir $HOME/Qt --modules qtmultimedia
444-
- python3 -m aqt install-qt linux desktop 6.8.3 --outputdir $HOME/Qt --modules qtmultimedia
445-
- export Qt6_DIR=$HOME/Qt/6.8.3/android_arm64_v8a
446-
- export QT_HOST_PATH=$HOME/Qt/6.8.3/gcc_64
447-
- export ANDROID_QT_BASE=$HOME/Qt/6.8.3
443+
- python3 -m aqt install-qt linux android 6.9.2 android_arm64_v8a --outputdir $HOME/Qt --modules qtmultimedia
444+
- python3 -m aqt install-qt linux desktop 6.9.2 --outputdir $HOME/Qt --modules qtmultimedia
445+
- export Qt6_DIR=$HOME/Qt/6.9.2/android_arm64_v8a
446+
- export QT_HOST_PATH=$HOME/Qt/6.9.2/gcc_64
447+
- export ANDROID_QT_BASE=$HOME/Qt/6.9.2
448448
script:
449449
- echo "$CI_PIPELINE_IID" > .build_id
450450
- |
@@ -479,11 +479,11 @@ build-color-android-ubuntu:
479479
- sdkmanager --install "ndk;26.1.10909125" "platforms;android-35" "build-tools;35.0.0"
480480
- export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/26.1.10909125
481481
- python3 -m pip install aqtinstall --break-system-packages
482-
- python3 -m aqt install-qt linux android 6.8.3 android_arm64_v8a --outputdir $HOME/Qt --modules qtmultimedia
483-
- python3 -m aqt install-qt linux desktop 6.8.3 --outputdir $HOME/Qt --modules qtmultimedia
484-
- export Qt6_DIR=$HOME/Qt/6.8.3/android_arm64_v8a
485-
- export QT_HOST_PATH=$HOME/Qt/6.8.3/gcc_64
486-
- export ANDROID_QT_BASE=$HOME/Qt/6.8.3
482+
- python3 -m aqt install-qt linux android 6.9.2 android_arm64_v8a --outputdir $HOME/Qt --modules qtmultimedia
483+
- python3 -m aqt install-qt linux desktop 6.9.2 --outputdir $HOME/Qt --modules qtmultimedia
484+
- export Qt6_DIR=$HOME/Qt/6.9.2/android_arm64_v8a
485+
- export QT_HOST_PATH=$HOME/Qt/6.9.2/gcc_64
486+
- export ANDROID_QT_BASE=$HOME/Qt/6.9.2
487487
script:
488488
- echo "$CI_PIPELINE_IID" > .build_id
489489
- |

0 commit comments

Comments
 (0)