From faa00ca78e27a40cbafe701348e6b3674e3ddeed Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Thu, 29 Dec 2022 15:39:43 +0100 Subject: [PATCH] ci: Use clang-15 in tsan task --- .cirrus.yml | 4 ++-- ci/test/00_setup_env_native_tsan.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7bc346cc307..68217b516ff 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -228,10 +228,10 @@ task: FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh" task: - name: '[TSan, depends, gui] [jammy]' + name: '[TSan, depends] [bookworm]' << : *GLOBAL_TASK_TEMPLATE container: - image: ubuntu:jammy + image: debian:bookworm cpu: 6 # Increase CPU and Memory to avoid timeout memory: 24G env: diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh index 66d18b974c2..776a1d8f97a 100755 --- a/ci/test/00_setup_env_native_tsan.sh +++ b/ci/test/00_setup_env_native_tsan.sh @@ -7,8 +7,8 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_native_tsan -export DOCKER_NAME_TAG=ubuntu:22.04 -export PACKAGES="clang-13 llvm-13 libc++abi-13-dev libc++-13-dev python3-zmq" -export DEP_OPTS="CC=clang-13 CXX='clang++-13 -stdlib=libc++'" +export DOCKER_NAME_TAG=debian:bookworm # For clang-15 +export PACKAGES="clang-15 llvm-15 libc++abi-15-dev libc++-15-dev python3-zmq" +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 export GOAL="install" -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++'" +export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' CXXFLAGS='-g' --with-sanitizers=thread"