Skip to content

Commit e9e2e87

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#26768: ci: Use clang-15 in tsan task
faa00ca ci: Use clang-15 in tsan task (MarcoFalke) Pull request description: Generally it is best to use the latest clang version for sanitizers, because it comes with the most features and bugfixes. So bump to clang-15, the latest release, for the tsan task. The task was using clang-13 (instead of 14) due to a bug, see bitcoin/bitcoin#24572 (comment). Bumping to 15 will hopefully fix this bug, as well as bitcoin/bitcoin#26759 (comment) ACKs for top commit: hebasto: ACK faa00ca Tree-SHA512: adb2386bb9615a3e1185e0624b0b68cd2738309530185819714a26e63bdf1c79461c4b4d3aa9cbe2fe08cc412349d7453f192abbbe9fb5adca74cf4b148ae7b7
2 parents 3b6e0f0 + faa00ca commit e9e2e87

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.cirrus.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,10 @@ task:
228228
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
229229

230230
task:
231-
name: '[TSan, depends, gui] [jammy]'
231+
name: '[TSan, depends] [bookworm]'
232232
<< : *GLOBAL_TASK_TEMPLATE
233233
container:
234-
image: ubuntu:jammy
234+
image: debian:bookworm
235235
cpu: 6 # Increase CPU and Memory to avoid timeout
236236
memory: 24G
237237
env:

ci/test/00_setup_env_native_tsan.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_tsan
10-
export DOCKER_NAME_TAG=ubuntu:22.04
11-
export PACKAGES="clang-13 llvm-13 libc++abi-13-dev libc++-13-dev python3-zmq"
12-
export DEP_OPTS="CC=clang-13 CXX='clang++-13 -stdlib=libc++'"
10+
export DOCKER_NAME_TAG=debian:bookworm # For clang-15
11+
export PACKAGES="clang-15 llvm-15 libc++abi-15-dev libc++-15-dev python3-zmq"
12+
export DEP_OPTS="CC=clang-15 CXX='clang++-15 -stdlib=libc++' NO_QR=1" # qr disabled due to libqrencode 3.4.4 compile failure, https://github.com/bitcoin/bitcoin/pull/26768#issuecomment-1367403430
1313
export GOAL="install"
14-
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' CXXFLAGS='-g' --with-sanitizers=thread CC=clang-13 CXX='clang++-13 -stdlib=libc++'"
14+
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' CXXFLAGS='-g' --with-sanitizers=thread"

0 commit comments

Comments
 (0)