Skip to content

Commit 8e81703

Browse files
authored
CI: Updated builds to Qt 6.8.1 (#4110)
Replaced install-qt.sh with aqtinstall, since aqtinstall has already been patched to be able to install Qt 6.8.1. It appears to require reading a destination path from an XML file, which is getting a bit much for a shell script. The Qt 6 AppImage builds are now done on Ubuntu 22.04, since the latest aqtinstall needed a more recent Python version. This required installing libfuse2 explicitly, to allow the linuxdeploy AppImage to run. The Qt 5 AppImage is now being built by Qbs 1.13. This is the oldest supported version of Qbs so it's good as additional test case.
1 parent 44fc91b commit 8e81703

File tree

2 files changed

+45
-486
lines changed

2 files changed

+45
-486
lines changed

.github/workflows/packages.yml

Lines changed: 45 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,28 @@ jobs:
4040
4141
linux:
4242
name: Linux (AppImage, Qt ${{ matrix.qt_version_major }})
43-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-${{ matrix.ubuntu_version }}
4444
needs: version
4545

4646
strategy:
4747
matrix:
4848
include:
49-
- qt_version: 5.15.2
49+
- ubuntu_version: 20.04
50+
qt_version: 5.15.2
5051
qt_version_major: 5
51-
- qt_version: 6.8.0
52+
qt_arch: gcc_64
53+
qt_install_args: ""
54+
qbs_default_profile: gcc
55+
- ubuntu_version: 22.04
56+
qt_version: 6.8.1
5257
qt_version_major: 6
58+
qt_arch: linux_gcc_64
59+
qt_install_args: "--modules qtimageformats"
60+
qbs_default_profile: x86_64-linux-gnu-gcc-11
5361

5462
env:
5563
TILED_VERSION: ${{ needs.version.outputs.version }}
5664
QT_VERSION: ${{ matrix.qt_version }}
57-
QTCREATOR_VERSION: 14.0.2
5865

5966
steps:
6067
- name: Checkout repository
@@ -75,12 +82,15 @@ jobs:
7582
libxcb-shape0 \
7683
libxcb-xinerama0 \
7784
libxkbcommon-x11-0 \
78-
libzstd-dev
85+
libzstd-dev \
86+
qbs \
87+
libfuse2
7988
8089
- name: Install Qt
8190
run: |
82-
./dist/install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative qtsvg qtimageformats qttools qttranslations icu | tee -a $GITHUB_PATH
83-
./dist/install-qt.sh --version ${QTCREATOR_VERSION} qtcreator | tee -a $GITHUB_PATH
91+
pip install aqtinstall
92+
aqt install-qt linux desktop ${QT_VERSION} ${{ matrix.qt_arch }} ${{ matrix.qt_install_args }} --outputdir /opt/Qt
93+
echo "/opt/Qt/${QT_VERSION}/gcc_64/bin" | tee -a $GITHUB_PATH
8494
8595
- name: Setup ccache
8696
uses: hendrikmuhs/ccache-action@v1
@@ -96,7 +106,7 @@ jobs:
96106
run: |
97107
qbs --version
98108
qbs setup-toolchains --detect
99-
qbs config defaultProfile x86_64-linux-gnu-gcc-10
109+
qbs config defaultProfile ${{ matrix.qbs_default_profile }}
100110
101111
- name: Build Sentry Native
102112
run: |
@@ -192,28 +202,33 @@ jobs:
192202
matrix:
193203
include:
194204
- qt_version: 5.12.12
205+
qt_dir: "clang_64"
206+
qt_install_args: ""
195207
version_suffix: "10.12-10.15"
196208
architectures: x86_64
197-
- qt_version: 6.8.0
209+
- qt_version: 6.8.1
210+
qt_dir: "macos"
211+
qt_install_args: "--modules qtimageformats"
198212
version_suffix: "11+"
199213
architectures: x86_64,arm64
200214

201215
env:
202216
TILED_VERSION: ${{ needs.version.outputs.version }}
203217
QT_VERSION: ${{ matrix.qt_version }}
204-
QTCREATOR_VERSION: 14.0.2
205218

206219
steps:
207220
- name: Checkout repository
208221
uses: actions/checkout@v4
209222

210223
- name: Install Qt
211224
run: |
212-
sudo ./dist/install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative qtsvg qtimageformats qttools | tee -a $GITHUB_PATH
213-
sudo ./dist/install-qt.sh --version ${QTCREATOR_VERSION} qtcreator | tee -a $GITHUB_PATH
225+
pip install aqtinstall
226+
sudo aqt install-qt mac desktop ${QT_VERSION} clang_64 ${{ matrix.qt_install_args }} --outputdir /opt/Qt
227+
echo "/opt/Qt/${QT_VERSION}/${{ matrix.qt_dir }}/bin" | tee -a $GITHUB_PATH
214228
215229
- name: Setup Qbs
216230
run: |
231+
brew install qbs
217232
qbs setup-toolchains --detect
218233
qbs config defaultProfile xcode
219234
@@ -280,26 +295,31 @@ jobs:
280295
include:
281296
- qt_version: 5.15.2
282297
qt_version_major: 5
283-
qt_toolchain: win32_mingw81
298+
qt_arch: win32_mingw81
299+
qt_dir: mingw81_32
300+
qt_install_args: ""
284301
arch: 32
285302
openssl_arch: x86
286303
filename_suffix: 'Windows-7-8_x86'
287-
mingw_version: 8.1.0
288-
mingw_component: mingw
289-
mingw_path: /c/Qt/Tools/mingw810_32/bin
290-
- qt_version: 6.8.0
304+
mingw_component: tools_mingw
305+
mingw_variant: qt.tools.win32_mingw810
306+
mingw_dir: mingw810_32
307+
- qt_version: 6.8.1
291308
qt_version_major: 6
292-
qt_toolchain: win64_mingw
309+
qt_arch: win64_mingw
310+
qt_dir: mingw_64
311+
qt_install_args: "--modules qtimageformats"
293312
arch: 64
294313
openssl_arch: x64
295314
filename_suffix: 'Windows-10+_x86_64'
296-
mingw_version: 13.1.0
297-
mingw_component: mingw1310
298-
mingw_path: /c/Qt/Tools/mingw1310_64/bin
315+
mingw_component: tools_mingw1310
316+
mingw_variant: qt.tools.win64_mingw1310
317+
mingw_dir: mingw1310_64
299318

300319
env:
301320
TILED_VERSION: ${{ needs.version.outputs.version }}
302-
MINGW_PATH: ${{ matrix.mingw_path }}
321+
MINGW_PATH: /c/Qt/Tools/${{ matrix.mingw_dir }}/bin
322+
QT_PATH: "/c/Qt/${{ matrix.qt_version }}/${{ matrix.qt_dir }}/bin"
303323

304324
defaults:
305325
run:
@@ -311,8 +331,9 @@ jobs:
311331

312332
- name: Install Qt
313333
run: |
314-
echo "QT_PATH=$(./dist/install-qt.sh --version ${{ matrix.qt_version }} --toolchain ${{ matrix.qt_toolchain }} qtbase qtdeclarative qtsvg qtimageformats qttools qttranslations)" >> $GITHUB_ENV
315-
./dist/install-qt.sh --version ${{ matrix.mingw_version }} --toolchain win${{ matrix.arch }}_mingw ${{ matrix.mingw_component }}
334+
pip install aqtinstall
335+
aqt install-qt windows desktop ${{ matrix.qt_version }} ${{ matrix.qt_arch }} ${{ matrix.qt_install_args }} --outputdir /c/Qt
336+
aqt install-tool windows desktop ${{ matrix.mingw_component }} ${{ matrix.mingw_variant }} --outputdir /c/Qt
316337
317338
- name: Install Qbs
318339
run: |

0 commit comments

Comments
 (0)