Skip to content

Commit 853f0d8

Browse files
committed
Merge bitcoin/bitcoin#33364: ci: always use tag for LLVM checkout
b736052 ci: always use tag for LLVM checkout (fanquake) Pull request description: Rather than trying to match the apt installed clang version, which is prone to intermittent issues. i.e #33345. ACKs for top commit: davidgumberg: ACK bitcoin/bitcoin@b736052 willcl-ark: ACK b736052 Tree-SHA512: 8e3fcc8219f573cec65941576c7995f21cae3330bcdbf615f799e8c5facd1146d3239a7284e9af7b013c37170ddf7435d7df6d2966f63fe7b4a8e4937311ff36
2 parents b814453 + b736052 commit 853f0d8

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

ci/test/01_base_install.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ if [ -n "$PIP_PACKAGES" ]; then
5656
fi
5757

5858
if [[ -n "${USE_INSTRUMENTED_LIBCPP}" ]]; then
59+
${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-21.1.1" /llvm-project
60+
5961
if [ -n "${APT_LLVM_V}" ]; then
60-
${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-$( clang --version | sed --silent 's@.*clang version \([0-9.]*\).*@\1@p' )" /llvm-project
61-
else
62-
${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-21.1.0" /llvm-project
6362

6463
cmake -G Ninja -B /clang_build/ \
6564
-DLLVM_ENABLE_PROJECTS="clang" \

0 commit comments

Comments
 (0)