From: Sam Gross Date: Mon, 22 Jul 2024 17:33:40 +0000 (-0400) Subject: Revert "gh-121946: Temporarily switch to llvm-17 in TSan CI (#121975)" (#122032) X-Git-Tag: v3.14.0a1~1028 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad935a901610bf54adcb35624b0202a03f2799b5;p=thirdparty%2FPython%2Fcpython.git Revert "gh-121946: Temporarily switch to llvm-17 in TSan CI (#121975)" (#122032) This reverts commit 12c1afa9d153fbdf78c970054c08c755f504c5e9. The LLVM 18 Ubuntu package is working now. --- 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