Skip to content

Commit e6e0953

Browse files
committed
The ubuntu-26.04 image already provides required LLVM 21.
1 parent 5f379bd commit e6e0953

4 files changed

Lines changed: 5 additions & 15 deletions

File tree

.github/workflows/jit.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ jobs:
160160
sudo ./.github/workflows/posix-deps-apt.sh
161161
- name: Build
162162
run: |
163-
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ env.LLVM_VERSION }}
164-
export PATH="$(llvm-config-${{ env.LLVM_VERSION }} --bindir):$PATH"
163+
# On ubuntu-26.04 image, clang is clang-21 by default
165164
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '' }}
166165
make all --jobs 4
167166
- name: Test
@@ -202,8 +201,7 @@ jobs:
202201
sudo ./.github/workflows/posix-deps-apt.sh
203202
- name: Build
204203
run: |
205-
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ env.LLVM_VERSION }}
206-
export PATH="$(llvm-config-${{ env.LLVM_VERSION }} --bindir):$PATH"
204+
# On ubuntu-26.04 image, clang is clang-21 by default
207205
if [ "${{ matrix.use_clang }}" = "true" ]; then
208206
export CC=clang-${{ env.LLVM_VERSION }}
209207
fi

.github/workflows/reusable-san.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,7 @@ jobs:
3737
- name: Install dependencies
3838
run: |
3939
sudo ./.github/workflows/posix-deps-apt.sh
40-
# Install clang
41-
wget https://apt.llvm.org/llvm.sh
42-
chmod +x llvm.sh
43-
sudo ./llvm.sh 21
44-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-21 100
45-
sudo update-alternatives --set clang /usr/bin/clang-21
46-
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-21 100
47-
sudo update-alternatives --set clang++ /usr/bin/clang++-21
40+
# On ubuntu-26.04 image, clang is clang-21 by default
4841
4942
if [ "${SANITIZER}" = "TSan" ]; then
5043
# Reduce ASLR to avoid TSan crashing

.github/workflows/reusable-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: Install Clang and BOLT
5050
if: ${{ fromJSON(inputs.bolt-optimizations) }}
5151
run: |
52-
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh 21
52+
# On ubuntu-26.04 image, LLVM is LLVM-21 by default
5353
sudo apt-get install --no-install-recommends bolt-21
5454
echo PATH="$(llvm-config-21 --bindir):$PATH" >> $GITHUB_ENV
5555
- name: Configure OpenSSL env vars

.github/workflows/tail-call.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ jobs:
8383
python-version: '3.11'
8484
- name: Build
8585
run: |
86-
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ env.LLVM_VERSION }}
87-
export PATH="$(llvm-config-${{ env.LLVM_VERSION }} --bindir):$PATH"
86+
# On ubuntu-26.04 image, clang is clang-21 by default
8887
CC=clang-${{ env.LLVM_VERSION }} ./configure --with-tail-call-interp ${{ matrix.configure_flags }}
8988
make all --jobs 4
9089
- name: Test

0 commit comments

Comments
 (0)