Skip to content

Commit 8887f6c

Browse files
committed
actions: add Qt versions to matrix
1 parent 302981e commit 8887f6c

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

.github/workflows/build.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,41 @@ on:
1010

1111
env:
1212
BUILD_TYPE: Release
13-
# For macOS qt keg-only package
14-
CMAKE_PREFIX_PATH: '/opt/homebrew/opt/qt@5'
1513

1614
jobs:
1715
build:
1816
strategy:
17+
fail-fast: false
1918
matrix:
2019
os: ['macos-latest', 'ubuntu-24.04', 'ubuntu-22.04']
20+
qt: ['qt5', 'qt6']
2121
runs-on: ${{ matrix.os }}
2222

2323
steps:
2424
- uses: actions/checkout@v2
2525

26+
- name: Set variables Qt5
27+
run: |
28+
echo "CMAKE_PREFIX_PATH='/opt/homebrew/opt/qt@5'" >> $GITHUB_ENV
29+
echo "QTPKG_MAC=qt@5" >> $GITHUB_ENV
30+
echo "QTPKG_UBUNTU=qtbase5-dev" >> $GITHUB_ENV
31+
if: matrix.qt == 'qt5'
32+
33+
- name: Set variables Qt6
34+
run: |
35+
echo "CMAKE_PREFIX_PATH='/opt/homebrew/opt/qt@6'" >> $GITHUB_ENV
36+
echo "QTPKG_MAC=qt@6" >> $GITHUB_ENV
37+
echo "QTPKG_UBUNTU=qt6-base-dev" >> $GITHUB_ENV
38+
if: matrix.qt == 'qt6'
39+
2640
- name: Install dependencies (macOS)
27-
run: brew install fftw liquid-dsp qt@5
41+
run: brew install fftw liquid-dsp ${{ env.QTPKG_MAC }}
2842
if: matrix.os == 'macos-latest'
2943

3044
- name: Install dependencies (Ubuntu)
3145
run: |
3246
sudo apt update
33-
sudo apt install libfftw3-dev libliquid-dev qtbase5-dev
47+
sudo apt install libfftw3-dev libliquid-dev libgl1-mesa-dev ${{ env.QTPKG_UBUNTU }}
3448
if: startsWith(matrix.os, 'ubuntu-')
3549

3650
- name: Create Build Environment

0 commit comments

Comments
 (0)