Skip to content

Commit f5b3eef

Browse files
authored
gh-152785: Upgrade LLVM to LLVM 21 in GitHub Action jobs (#152781)
Upgrade LLVM to LLVM 21 in GitHub Action jobs: * Reusable Sanitizer * Reusable Ubuntu ("Install Clang and BOLT")
1 parent ac1acb6 commit f5b3eef

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/reusable-san.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040
# Install clang
4141
wget https://apt.llvm.org/llvm.sh
4242
chmod +x llvm.sh
43-
sudo ./llvm.sh 20
44-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 100
45-
sudo update-alternatives --set clang /usr/bin/clang-20
46-
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 100
47-
sudo update-alternatives --set clang++ /usr/bin/clang++-20
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
4848
4949
if [ "${SANITIZER}" = "TSan" ]; then
5050
# Reduce ASLR to avoid TSan crashing

.github/workflows/reusable-ubuntu.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ 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 19
53-
sudo apt-get install --no-install-recommends bolt-19
54-
echo PATH="$(llvm-config-19 --bindir):$PATH" >> $GITHUB_ENV
52+
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh 21
53+
sudo apt-get install --no-install-recommends bolt-21
54+
echo PATH="$(llvm-config-21 --bindir):$PATH" >> $GITHUB_ENV
5555
- name: Configure OpenSSL env vars
5656
run: |
5757
echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV"

0 commit comments

Comments
 (0)