From b736052e39f1f466f63f261ace3dd2deba171e8a Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 10 Sep 2025 09:12:40 +0100 Subject: [PATCH] ci: always use tag for LLVM checkout Rather than trying to match the apt installed clang version, which is prone to intermittent issues. i.e #33345. --- ci/test/01_base_install.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh index b1a9d6257bd..6944ab42b06 100755 --- a/ci/test/01_base_install.sh +++ b/ci/test/01_base_install.sh @@ -56,10 +56,9 @@ if [ -n "$PIP_PACKAGES" ]; then fi if [[ -n "${USE_INSTRUMENTED_LIBCPP}" ]]; then + ${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-21.1.1" /llvm-project + if [ -n "${APT_LLVM_V}" ]; then - ${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 - else - ${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-21.1.0" /llvm-project cmake -G Ninja -B /clang_build/ \ -DLLVM_ENABLE_PROJECTS="clang" \