Skip to content

Commit 6a46be7

Browse files
committed
Merge bitcoin/bitcoin#31793: ci: Use clang-20 for sanitizer tasks
fa5a02b ci: Use clang-20 for sanitizer tasks (MarcoFalke) Pull request description: A new clang version generally comes with bugfixes, new (sanitizer) features, and deprecations. Upgrade the sanitizer tasks to use the new version. This was also suggested in bitcoin/bitcoin#31691 (comment) ACKs for top commit: fanquake: ACK fa5a02b - tested 20 in some other infra, we just needed to fix the same deprecation warnings we'd seen, in cryptofuzz: fanquake/cryptofuzz@09ca550. Tree-SHA512: 6114d790b5d7145eb5f019e02da6c2c833342707ad67fb9f9c09506001afbef0c9b9beee7e51321f17f12ea692509d6428e6072ad105dba51e4d54cd057621cd
2 parents 329b60f + fa5a02b commit 6a46be7

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

ci/test/00_setup_env_native_asan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ else
1919
fi
2020

2121
export CONTAINER_NAME=ci_native_asan
22-
export APT_LLVM_V="19"
22+
export APT_LLVM_V="20"
2323
export PACKAGES="systemtap-sdt-dev clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev python3-zmq qtbase5-dev qttools5-dev qttools5-dev-tools libevent-dev libboost-dev libdb5.3++-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
2424
export NO_DEPENDS=1
2525
export GOAL="install"

ci/test/00_setup_env_native_fuzz.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
1010
export CONTAINER_NAME=ci_native_fuzz
11-
export APT_LLVM_V="19"
11+
export APT_LLVM_V="20"
1212
export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev libevent-dev libboost-dev libsqlite3-dev"
1313
export NO_DEPENDS=1
1414
export RUN_UNIT_TESTS=false

ci/test/00_setup_env_native_tsan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_tsan
1010
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
11-
export APT_LLVM_V="19"
11+
export APT_LLVM_V="20"
1212
export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev libc++abi-${APT_LLVM_V}-dev libc++-${APT_LLVM_V}-dev python3-zmq"
1313
export DEP_OPTS="CC=clang-${APT_LLVM_V} CXX='clang++-${APT_LLVM_V} -stdlib=libc++'"
1414
export GOAL="install"

ci/test/01_base_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if [ -n "$PIP_PACKAGES" ]; then
4949
fi
5050

5151
if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
52-
${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-19.1.6" /msan/llvm-project
52+
${CI_RETRY_EXE} git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-20.1.0-rc1" /msan/llvm-project
5353

5454
cmake -G Ninja -B /msan/clang_build/ \
5555
-DLLVM_ENABLE_PROJECTS="clang" \

0 commit comments

Comments
 (0)