Skip to content

Commit 25d1116

Browse files
committed
ci: fix llvm 23 packages install
1 parent b61c6a5 commit 25d1116

2 files changed

Lines changed: 24 additions & 9 deletions

File tree

.github/workflows/premerge.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,19 @@ jobs:
2020

2121
- name: Install LLVM
2222
run: |
23-
wget https://apt.llvm.org/llvm.sh
24-
chmod +x llvm.sh
25-
sudo ./llvm.sh 23
26-
sudo apt install libmlir-23-dev mlir-23-tools
23+
# LLVM 23 has branched, so it lives in its own apt suite now. Upstream
24+
# llvm.sh still maps 23 to the unversioned suite, which serves LLVM 24
25+
# snapshots, so add the release repository directly instead.
26+
CODENAME=$(lsb_release -cs)
27+
sudo mkdir -p /etc/apt/keyrings
28+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key \
29+
| sudo tee /etc/apt/keyrings/apt.llvm.org.asc > /dev/null
30+
echo "deb [signed-by=/etc/apt/keyrings/apt.llvm.org.asc] https://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-23 main" \
31+
| sudo tee /etc/apt/sources.list.d/llvm-23.list > /dev/null
32+
sudo apt-get update
33+
# The snapshot packaging pulled in llvm-23-dev via libmlir-23-dev; the
34+
# release packaging does not, and MLIRConfig.cmake needs LLVMConfig.cmake.
35+
sudo apt-get install -y clang-23 lld-23 llvm-23-dev libmlir-23-dev mlir-23-tools
2736
2837
- name: ccache
2938
uses: hendrikmuhs/ccache-action@v1.2

CLAUDE.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,18 @@ This is an experimental Python 3.9-compatible interpreter implementation in C++.
1515
- GMP (GNU Multiple Precision library)
1616
- ICU (International Components for Unicode)
1717

18-
Install LLVM/MLIR on Ubuntu:
18+
Install LLVM/MLIR on Ubuntu. LLVM 23 has branched, so it has its own apt suite;
19+
`llvm.sh` still maps 23 to the unversioned suite (LLVM 24 snapshots), so add the
20+
release repository directly:
1921
```bash
20-
wget https://apt.llvm.org/llvm.sh
21-
chmod +x llvm.sh
22-
sudo ./llvm.sh 23 all
23-
sudo apt install libmlir-23-dev mlir-23-tools
22+
CODENAME=$(lsb_release -cs)
23+
sudo mkdir -p /etc/apt/keyrings
24+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key \
25+
| sudo tee /etc/apt/keyrings/apt.llvm.org.asc > /dev/null
26+
echo "deb [signed-by=/etc/apt/keyrings/apt.llvm.org.asc] https://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-23 main" \
27+
| sudo tee /etc/apt/sources.list.d/llvm-23.list > /dev/null
28+
sudo apt-get update
29+
sudo apt-get install -y clang-23 lld-23 llvm-23-dev libmlir-23-dev mlir-23-tools
2430
```
2531

2632
### Build Commands

0 commit comments

Comments
 (0)