Skip to content

Commit 6d8dda7

Browse files
committed
github: ci: ubuntu 20->24
1 parent 898af9f commit 6d8dda7

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

.github/workflows/cmake.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ jobs:
66
fail-fast: false
77
matrix:
88
include:
9-
- platform: ubuntu-20.04
10-
compiler: g++-9
11-
compiler_c: gcc-9
9+
- platform: ubuntu-24.04
10+
compiler: g++-14
11+
compiler_c: gcc-14
1212
extra_cmake_args: -GNinja
13-
- platform: ubuntu-20.04
14-
compiler: clang++-10
15-
compiler_c: clang-10
13+
- platform: ubuntu-24.04
14+
compiler: clang++-18
15+
compiler_c: clang-18
1616
extra_cmake_args: -GNinja
1717
- platform: windows-2019
1818
compiler: msvc2019 ## == vs 16
@@ -27,18 +27,15 @@ jobs:
2727
run: |
2828
wget "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" -O "${{ runner.workspace }}/linuxdeployqt"
2929
chmod +x "${{ runner.workspace }}/linuxdeployqt"
30-
if: ${{ matrix.platform == 'ubuntu-20.04' }}
30+
if: ${{ matrix.platform == 'ubuntu-24.04' }}
3131

32-
- name: "dependency: clang (linux)"
33-
run: sudo apt update && sudo apt install clang-10
34-
if: ${{ matrix.platform == 'ubuntu-20.04' && matrix.compiler == 'clang++-10' }}
3532
- name: "dependency: ninja (linux)"
3633
run: sudo apt update && sudo apt install ninja-build
37-
if: ${{ matrix.platform == 'ubuntu-20.04' }}
34+
if: ${{ matrix.platform == 'ubuntu-24.04' }}
3835

3936
- name: "dependency: qt5 (linux)"
40-
run: sudo apt update && sudo apt install -y qtbase5-dev qt5-default
41-
if: ${{ matrix.platform == 'ubuntu-20.04' }}
37+
run: sudo apt update && sudo apt install -y qtbase5-dev
38+
if: ${{ matrix.platform == 'ubuntu-24.04' }}
4239
- name: "dependency: qt5 (windows)"
4340
uses: jurplel/install-qt-action@v4
4441
with:
@@ -71,12 +68,12 @@ jobs:
7168
echo 'Icon=default' >> "${{ github.workspace }}/install/default.desktop"
7269
echo 'Categories=Game;' >> "${{ github.workspace }}/install/default.desktop"
7370
"${{ runner.workspace }}/linuxdeployqt" "${{ github.workspace }}/install/noggit" -appimage -bundle-non-qt-libs -no-strip -verbose=2
74-
if: ${{ matrix.platform == 'ubuntu-20.04' }}
71+
if: ${{ matrix.platform == 'ubuntu-24.04' }}
7572
- uses: actions/upload-artifact@v4
7673
with:
7774
name: ${{ matrix.platform }}-${{ matrix.compiler }}-appimage
7875
path: Noggit*.AppImage
79-
if: ${{ matrix.platform == 'ubuntu-20.04' }}
76+
if: ${{ matrix.platform == 'ubuntu-24.04' }}
8077

8178
- run: |
8279
mkdir dependencies/

0 commit comments

Comments
 (0)