Skip to content

Commit 925fbdc

Browse files
committed
build.yaml: Cover both Qt 5 and Qt 6
1 parent d6b379b commit 925fbdc

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

.github/workflows/build.yaml

+12-5
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,20 @@ jobs:
3333
fail-fast: false
3434
matrix:
3535
include:
36+
- runs-on: ubuntu-22.04
37+
qt_major: 5
38+
qt_packages: qt5-qmake qtbase5-dev
3639
- runs-on: ubuntu-24.04
37-
qt: qt5-qmake
40+
qt_major: 6
41+
qt_packages: qmake6 qt6-base-dev
42+
- runs-on: ubuntu-22.04
43+
qt_major: 5
44+
qt_packages: qt5-qmake qtbase5-dev
3845
- runs-on: ubuntu-22.04
39-
qt: qt5-qmake
46+
qt_major: 6
47+
qt_packages: qmake6 qt6-base-dev
4048

41-
name: Build (Linux, ${{ matrix.runs-on }})
49+
name: Build (Linux, ${{ matrix.runs-on }}, Qt ${{ matrix.qt_major }})
4250
runs-on: ${{ matrix.runs-on }}
4351
steps:
4452
- name: 'Install build dependencies'
@@ -49,8 +57,7 @@ jobs:
4957
build-essential \
5058
libapr1-dev \
5159
libsvn-dev \
52-
${{ matrix.qt }} \
53-
qtbase5-dev \
60+
${{ matrix.qt_packages }} \
5461
subversion
5562
5663
- name: 'Checkout Git branch'

0 commit comments

Comments
 (0)