Skip to content

Commit 2200086

Browse files
committed
Merge bitcoin/bitcoin#27298: ci: Use TSan new runtime (llvm-16, take 3)
faf4aca ci: Use TSan new runtime (llvm-16, take 3) (MarcoFalke) Pull request description: The previous two attempts failed: * llvm-14: Failed in bitcoin/bitcoin#24572 * llvm-15: Failed in bitcoin/bitcoin#26775 However, now that the bug is known and fixed, it should be good to go. See also bitcoin/bitcoin#26775 (comment) ACKs for top commit: fanquake: ACK faf4aca - I still see [this](bitcoin/bitcoin#27298 (comment)) failure on aarch64, but that isn't really a regression, as running this tests was already broken for me. I'll open a separate issue, and we can follow up. Tree-SHA512: 372b53c4d42ca7f527dae4a2b5bc5ab33c816930daf7a3479d20ea7749159a0b19cfd8d76244b95b03130e4a3d12ddbbb74668b8f7e9fc272cf1084f53b7ff9b
2 parents 8d31d76 + faf4aca commit 2200086

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.cirrus.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,10 @@ task:
232232
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
233233

234234
task:
235-
name: '[TSan, depends, gui] [jammy]'
235+
name: '[TSan, depends, gui] [lunar]'
236236
<< : *GLOBAL_TASK_TEMPLATE
237237
container:
238-
image: ubuntu:jammy
238+
image: ubuntu:lunar
239239
cpu: 6 # Increase CPU and Memory to avoid timeout
240240
memory: 24G
241241
env:

ci/test/00_setup_env_native_tsan.sh

+3-3
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 CI_IMAGE_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 CI_IMAGE_NAME_TAG=ubuntu:23.04 # Version 23.04 will reach EOL in Jan 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version).
11+
export PACKAGES="clang-16 llvm-16 libclang-rt-16-dev libc++abi-16-dev libc++-16-dev python3-zmq"
12+
export DEP_OPTS="CC=clang-16 CXX='clang++-16 -stdlib=libc++'"
1313
export GOAL="install"
1414
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' CXXFLAGS='-g' --with-sanitizers=thread"

0 commit comments

Comments
 (0)