Commit 6333d1b

committed

build.yaml: Cover both Qt 5 and Qt 6

1 parent c32b1ee commit 6333d1bCopy full SHA for 6333d1b

File tree

+19

-6

lines changed

+19

-6

lines changed

Lines changed: 19 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,23 @@ jobs:`
`34`	`34`	`matrix:`
`35`	`35`	`include:`
`36`	`36`	`- runs-on: ubuntu-24.04`
`37`		`- qt: qt5-qmake`
	`37`	`+ qt_major: 6`
	`38`	`+ qt_qmake: qmake6`
	`39`	`+ qt_packages: qmake6 qt6-base-dev qt6-5compat-dev`
	`40`	`+ - runs-on: ubuntu-24.04`
	`41`	`+ qt_major: 5`
	`42`	`+ qt_qmake: qmake`
	`43`	`+ qt_packages: qt5-qmake qtbase5-dev`
	`44`	`+ - runs-on: ubuntu-22.04`
	`45`	`+ qt_major: 6`
	`46`	`+ qt_qmake: qmake6`
	`47`	`+ qt_packages: qmake6 qt6-base-dev libqt6core5compat6-dev`
`38`	`48`	`- runs-on: ubuntu-22.04`
`39`		`- qt: qt5-qmake`
	`49`	`+ qt_major: 5`
	`50`	`+ qt_qmake: qmake`
	`51`	`+ qt_packages: qt5-qmake qtbase5-dev`
`40`	`52`
`41`		`- name: Build (Linux, ${{ matrix.runs-on }})`
	`53`	`+ name: Build (Linux, ${{ matrix.runs-on }}, Qt ${{ matrix.qt_major }})`
`42`	`54`	`runs-on: ${{ matrix.runs-on }}`
`43`	`55`	`steps:`
`44`	`56`	`- name: 'Install build dependencies'`
`@@ -49,8 +61,7 @@ jobs:`
`49`	`61`	`build-essential \`
`50`	`62`	`libapr1-dev \`
`51`	`63`	`libsvn-dev \`
`52`		`- ${{ matrix.qt }} \`
`53`		`- qtbase5-dev \`
	`64`	`+ ${{ matrix.qt_packages }} \`
`54`	`65`	`subversion`
`55`	`66`
`56`	`67`	`- name: 'Checkout Git branch'`
`@@ -59,8 +70,10 @@ jobs:`
`59`	`70`	`submodules: true`
`60`	`71`
`61`	`72`	`- name: 'Configure'`
	`73`	`+ env:`
	`74`	`+ QMAKE: ${{ matrix.qt_qmake }}`
`62`	`75`	`run: \|-`
`63`		`- qmake`
	`76`	`+ ${QMAKE}`
`64`	`77`
`65`	`78`	`- name: 'Build'`
`66`	`79`	`run: \|-`

Comments

(0)