Skip to content

Commit 76cc00c

Browse files
authored
Merge pull request #111 from ruby/fix-build-ci
Fix build CI and upgrade base images for clang/llvm 17+
2 parents 4dd5c8e + 5e60b49 commit 76cc00c

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

.github/workflows/publish.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ jobs:
3131
- { os: 'focal', tag: 'gcc-8', extras: 'g++-8' }
3232
- { os: 'focal', tag: 'gcc-7', extras: 'g++-7' }
3333

34-
- { os: 'noble', tag: 'clang-21', extras: 'llvm-21' }
35-
- { os: 'jammy', tag: 'clang-20', extras: 'llvm-20' }
36-
- { os: 'jammy', tag: 'clang-19', extras: 'llvm-19' }
37-
- { os: 'jammy', tag: 'clang-18', extras: 'llvm-18' }
38-
- { os: 'jammy', tag: 'clang-17', extras: 'llvm-17' }
34+
- { os: 'noble', tag: 'clang-22', extras: 'llvm-22' }
35+
# clang-21/llvm-21 packages are not found now.
36+
# - { os: 'noble', tag: 'clang-21', extras: 'llvm-21' }
37+
- { os: 'noble', tag: 'clang-20', extras: 'llvm-20' }
38+
- { os: 'noble', tag: 'clang-19', extras: 'llvm-19' }
39+
- { os: 'noble', tag: 'clang-18', extras: 'llvm-18' }
40+
- { os: 'noble', tag: 'clang-17', extras: 'llvm-17' }
3941
- { os: 'jammy', tag: 'clang-16', extras: 'llvm-16' }
4042
- { os: 'jammy', tag: 'clang-15', extras: 'llvm-15' }
4143
- { os: 'jammy', tag: 'clang-14', extras: 'llvm-14' }

assets/99jammy.list

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/
44
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main
55
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main
66
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main
7-
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main
8-
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
9-
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main
10-
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main
117
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy main
128

139
deb-src [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu jammy main
@@ -16,8 +12,4 @@ deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.
1612
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main
1713
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main
1814
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main
19-
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main
20-
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
21-
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main
22-
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main
2315
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/jammy/ llvm-toolchain-jammy main

assets/99noble.list

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
deb [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu noble main
22
deb [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu noble main
3+
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-17 main
4+
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main
5+
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main
6+
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main
7+
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-21 main
38
deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble main
49

510
deb-src [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu noble main
611
deb-src [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu noble main
12+
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-17 main
13+
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main
14+
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main
15+
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main
16+
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble-21 main
717
deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/noble/ llvm-toolchain-noble main

0 commit comments

Comments
 (0)