Skip to content

Commit 7d1db8f

Browse files
committed
ci: enable ubuntu24.04 and deprecate 20.04
also enable clang 18 on 24.04 Signed-off-by: Carl Zhang <[email protected]>
1 parent 3da1ba7 commit 7d1db8f

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/workflows/install-clang.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ fi
1010
if ! which $CC >/dev/null 2>&1; then
1111
case $DISTRO in
1212
"ubuntu-22.04") distro_name=jammy;;
13-
"ubuntu-20.04") distro_name=focal;;
13+
"ubuntu-24.04") distro_name=noble;;
1414
*)
1515
echo "Unknown distribution $DISTRO"
1616
exit 1
1717
esac
1818
case $1 in
19-
"14" | "15") llvm_version=$1;;
19+
"18" | "15") llvm_version=$1;;
2020
*)
2121
echo "Unknown llvm version $1"
2222
exit 1

.github/workflows/ubuntu.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
test:
1313
strategy:
1414
matrix:
15-
compiler: [clang-15, gcc]
16-
os: [ubuntu-22.04, ubuntu-20.04]
15+
compiler: [clang, gcc]
16+
os: [ubuntu-24.04, ubuntu-22.04]
1717
build: [meson, autotools]
1818
runs-on: ${{ matrix.os }}
1919
env:
@@ -23,8 +23,11 @@ jobs:
2323
- name: 'Checkout'
2424
uses: actions/checkout@v4
2525
- name: 'Install toolchain'
26-
if: ${{ (matrix.compiler == 'clang-15') }}
26+
if: ${{ (matrix.compiler == 'clang') && (matrix.os == 'ubuntu-22.04') }}
2727
run: .github/workflows/install-clang.sh 15
28+
- name: 'Install toolchain'
29+
if: ${{ (matrix.compiler == 'clang') && (matrix.os == 'ubuntu-24.04') }}
30+
run: .github/workflows/install-clang.sh 18
2831
- name: 'Install prerequisites'
2932
run: |
3033
sudo apt-get update

0 commit comments

Comments
 (0)