Skip to content

Commit 684df66

Browse files
committed
Add Ubuntu 24.04 target and eliminate Ubuntu 20.04 target.
1 parent fa35a5c commit 684df66

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

.github/workflows/cppcmake.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
config:
32+
- name: "ubuntu-24.04"
33+
os: "ubuntu-24.04"
3234
- name: "ubuntu-22.04"
3335
os: "ubuntu-22.04"
34-
- name: "ubuntu-20.04"
35-
os: "ubuntu-20.04"
3636
- name: "windows-x64"
3737
os: "windows-latest"
3838
cmake_extra: "-T v142,host=x86"
@@ -74,12 +74,8 @@ jobs:
7474
version: ${{ matrix.config.qt_ver }}
7575
arch: ${{ matrix.config.qt_arch }}
7676

77-
- name: Install Qt (Ubuntu focal)
78-
if: matrix.config.os == 'ubuntu-20.04'
79-
run: sudo apt install qtbase5-dev
80-
81-
- name: Install Qt (Ubuntu jammy)
82-
if: matrix.config.os == 'ubuntu-22.04'
77+
- name: Install Qt (Ubuntu)
78+
if: startsWith(matrix.config.os, 'ubuntu-')
8379
run: sudo apt install qt6-base-dev freeglut3-dev
8480

8581
- name: Install Qt (MacOS)

0 commit comments

Comments
 (0)