From 9bdd1f0a00149c1f2dbd57eabb7cd2acd47f7dbf Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 3 Jul 2026 13:44:24 +0200 Subject: [PATCH] gh-152785: Upgrade LLVM to LLVM 21 in GitHub Action jobs (GH-152781) Upgrade LLVM to LLVM 21 in GitHub Action jobs: * Reusable Sanitizer * Reusable Ubuntu ("Install Clang and BOLT") (cherry picked from commit f5b3eefbdabeedb71f0d69f60a6f8d71dc11873a) Co-authored-by: Victor Stinner --- .github/workflows/reusable-san.yml | 10 +++++----- .github/workflows/reusable-ubuntu.yml | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/reusable-san.yml b/.github/workflows/reusable-san.yml index ef36447964cf418..aed2776b4bab718 100644 --- a/.github/workflows/reusable-san.yml +++ b/.github/workflows/reusable-san.yml @@ -40,11 +40,11 @@ jobs: # Install clang wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 20 - sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 100 - sudo update-alternatives --set clang /usr/bin/clang-20 - sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 100 - sudo update-alternatives --set clang++ /usr/bin/clang++-20 + sudo ./llvm.sh 21 + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-21 100 + sudo update-alternatives --set clang /usr/bin/clang-21 + sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-21 100 + sudo update-alternatives --set clang++ /usr/bin/clang++-21 if [ "${SANITIZER}" = "TSan" ]; then # Reduce ASLR to avoid TSan crashing diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml index f4321cefa1b5985..564ad024ec1f8a3 100644 --- a/.github/workflows/reusable-ubuntu.yml +++ b/.github/workflows/reusable-ubuntu.yml @@ -49,9 +49,9 @@ jobs: - name: Install Clang and BOLT if: ${{ fromJSON(inputs.bolt-optimizations) }} run: | - sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh 19 - sudo apt-get install --no-install-recommends bolt-19 - echo PATH="$(llvm-config-19 --bindir):$PATH" >> $GITHUB_ENV + sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh 21 + sudo apt-get install --no-install-recommends bolt-21 + echo PATH="$(llvm-config-21 --bindir):$PATH" >> $GITHUB_ENV - name: Configure OpenSSL env vars run: | echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV"