Skip to content

Commit 22222ea

Browse files
committed
Add ubuntu 22.04 to CI;
Use OS' native-ish Qt for more compatible distribution.
1 parent ba4d8be commit 22222ea

1 file changed

Lines changed: 17 additions & 4 deletions

File tree

.github/workflows/cppcmake.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
config:
32+
- name: "ubuntu-22.04"
33+
os: "ubuntu-latest"
3234
- name: "ubuntu-20.04"
3335
os: "ubuntu-20.04"
34-
qt_ver: "6.3.0"
3536
- name: "ubuntu-18.04"
3637
os: "ubuntu-18.04"
3738
qt_ver: "5.12.12"
@@ -40,7 +41,7 @@ jobs:
4041
cmake_extra: "-T v142,host=x86"
4142
arch: "amd64"
4243
qt_arch: "win64_msvc2019_64"
43-
qt_ver: "6.3.0"
44+
qt_ver: "6.4.*"
4445
- name: "windows-x86"
4546
os: "windows-latest"
4647
cmake_extra: "-T v142,host=x86 -A Win32"
@@ -49,7 +50,6 @@ jobs:
4950
qt_ver: "5.15.2"
5051
- name: "macOS-10"
5152
os: "macos-10.15"
52-
qt_ver: "6.3.0"
5353
steps:
5454
- uses: actions/checkout@v2
5555

@@ -70,12 +70,25 @@ jobs:
7070
if: startsWith(matrix.config.os, 'macos-')
7171
run: brew install labstreaminglayer/tap/lsl
7272

73-
- name: Install Qt
73+
- name: Install Qt (Window and Ubuntu bionic)
74+
if: (matrix.config.os == 'windows-latest') || (matrix.config.os == 'ubuntu-18.04')
7475
uses: jurplel/install-qt-action@v2.14.0
7576
with:
7677
version: ${{ matrix.config.qt_ver }}
7778
arch: ${{ matrix.config.qt_arch }}
7879

80+
- name: Install Qt (Ubuntu focal)
81+
if: matrix.config.os == 'ubuntu-20.04'
82+
run: sudo apt install qtbase5-dev
83+
84+
- name: Install Qt (Ubuntu jammy)
85+
if: matrix.config.os == 'ubuntu-22.04'
86+
run: sudo apt install qt6-base-dev freeglut3-dev
87+
88+
- name: Install Qt (MacOS)
89+
if: startsWith(matrix.config.os, 'macos-')
90+
run: brew install qt
91+
7992
- name: Configure CMake
8093
run: |
8194
cmake --version

0 commit comments

Comments
 (0)