Skip to content

Commit e175bd3

Browse files
[3.13] Revert "gh-121946: Temporarily switch to llvm-17 in TSan CI (GH-121975)" (GH-122032) (#122131)
This reverts commit 53774e9. The LLVM 18 Ubuntu package is working now. (cherry picked from commit ad935a9) Co-authored-by: Sam Gross <[email protected]>
1 parent f00ba73 commit e175bd3

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/reusable-tsan.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ jobs:
3636
# Install clang-18
3737
wget https://apt.llvm.org/llvm.sh
3838
chmod +x llvm.sh
39-
sudo ./llvm.sh 17 # gh-121946: llvm-18 package is temporarily broken
40-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 100
41-
sudo update-alternatives --set clang /usr/bin/clang-17
42-
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-17 100
43-
sudo update-alternatives --set clang++ /usr/bin/clang++-17
39+
sudo ./llvm.sh 18
40+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100
41+
sudo update-alternatives --set clang /usr/bin/clang-18
42+
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100
43+
sudo update-alternatives --set clang++ /usr/bin/clang++-18
4444
# Reduce ASLR to avoid TSAN crashing
4545
sudo sysctl -w vm.mmap_rnd_bits=28
4646
- name: TSAN Option Setup

0 commit comments

Comments
 (0)