From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 19 Apr 2026 15:39:04 +0000 (+0200)
Subject: [3.13] gh-121946: Use clang-20 for TSan build (GH-148570) (#148754)
X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=00a9a8a077f224635e88f4537b5a36c9ef45f903;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-121946: Use clang-20 for TSan build (GH-148570) (#148754)

Co-authored-by: Sam Gross <colesbury@gmail.com>
---

diff --git a/.github/workflows/reusable-san.yml b/.github/workflows/reusable-san.yml
index 82d6759b6347..42ecaa51118c 100644
--- a/.github/workflows/reusable-san.yml
+++ b/.github/workflows/reusable-san.yml
@@ -40,17 +40,15 @@ 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
 
         if [ "${SANITIZER}" = "TSan" ]; then
-          sudo ./llvm.sh 17  # gh-121946: llvm-18 package is temporarily broken
-          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 100
-          sudo update-alternatives --set clang /usr/bin/clang-17
-          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-17 100
-          sudo update-alternatives --set clang++ /usr/bin/clang++-17
           # Reduce ASLR to avoid TSan crashing
           sudo sysctl -w vm.mmap_rnd_bits=28
-        else
-          sudo ./llvm.sh 20
         fi
 
     - name: Sanitizer option setup