[3.15] gh-152785: Upgrade LLVM to LLVM 21 in GitHub Action jobs (GH-152781) (#152968)

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 <vstinner@python.org>

diff --git a/.github/workflows/reusable-san.yml b/.github/workflows/reusable-san.yml
index ef36447964cf41859cd12dd2d12c167dcc24a444..aed2776b4bab71887286b5841e0b7526e77210d7 100644 (file)
--- 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 f4321cefa1b59856fabe9937305adacc643ece48..564ad024ec1f8a3885c9922d433ce2c6a12904b5 100644 (file)
--- 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"