From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Mon, 22 Jul 2024 17:57:36 +0000 (+0200) Subject: [3.13] Revert "gh-121946: Temporarily switch to llvm-17 in TSan CI (GH-121975)" ... X-Git-Tag: v3.13.0rc1~71 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e175bd3aafc754a7c5cbb2dba5b2e2e990e46b22;p=thirdparty%2FPython%2Fcpython.git [3.13] Revert "gh-121946: Temporarily switch to llvm-17 in TSan CI (GH-121975)" (GH-122032) (#122131) This reverts commit 53774e911df09c68cab2b9902b6e623e0f8cc908. The LLVM 18 Ubuntu package is working now. (cherry picked from commit ad935a901610bf54adcb35624b0202a03f2799b5) Co-authored-by: Sam Gross --- diff --git a/.github/workflows/reusable-tsan.yml b/.github/workflows/reusable-tsan.yml index 27f4eacd86fd..b6d5d8fa1c71 100644 --- a/.github/workflows/reusable-tsan.yml +++ b/.github/workflows/reusable-tsan.yml @@ -36,11 +36,11 @@ jobs: # Install clang-18 wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - 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 + sudo ./llvm.sh 18 + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 + sudo update-alternatives --set clang /usr/bin/clang-18 + sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100 + sudo update-alternatives --set clang++ /usr/bin/clang++-18 # Reduce ASLR to avoid TSAN crashing sudo sysctl -w vm.mmap_rnd_bits=28 - name: TSAN Option Setup