Commit 4ccb673

committed

build.yaml: Cover both Qt 5 and Qt 6

1 parent 4d63f79 commit 4ccb673Copy full SHA for 4ccb673

File tree

+15

-6

lines changed

+15

-6

lines changed

Lines changed: 15 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,19 @@ 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`
`38`	`44`	`- runs-on: ubuntu-22.04`
`39`		`- qt: qt5-qmake`
	`45`	`+ qt_major: 5`
	`46`	`+ qt_qmake: qmake`
	`47`	`+ qt_packages: qt5-qmake qtbase5-dev`
`40`	`48`
`41`		`- name: Build (Linux, ${{ matrix.runs-on }})`
	`49`	`+ name: Build (Linux, ${{ matrix.runs-on }}, Qt ${{ matrix.qt_major }})`
`42`	`50`	`runs-on: ${{ matrix.runs-on }}`
`43`	`51`	`steps:`
`44`	`52`	`- name: 'Install build dependencies'`
`@@ -49,8 +57,7 @@ jobs:`
`49`	`57`	`build-essential \`
`50`	`58`	`libapr1-dev \`
`51`	`59`	`libsvn-dev \`
`52`		`- ${{ matrix.qt }} \`
`53`		`- qtbase5-dev \`
	`60`	`+ ${{ matrix.qt_packages }} \`
`54`	`61`	`subversion`
`55`	`62`
`56`	`63`	`- name: 'Checkout Git branch'`
`@@ -59,8 +66,10 @@ jobs:`
`59`	`66`	`submodules: true`
`60`	`67`
`61`	`68`	`- name: 'Configure'`
	`69`	`+ env:`
	`70`	`+ QMAKE: ${{ matrix.qt_qmake }}`
`62`	`71`	`run: \|-`
`63`		`- qmake`
	`72`	`+ ${QMAKE}`
`64`	`73`
`65`	`74`	`- name: 'Build'`
`66`	`75`	`run: \|-`

Comments

(0)