Skip to content

Commit 77b3bdd

Browse files
committed
ci: Use clang-18 in tsan task (Ubuntu 20.04)
Cherry-picked from fabb6af Cherry-picked from faf4aca Cherry-picked from fa23c9a Cherry-picked from fa83b65 Cherry-picked from fa75220
1 parent 06b72ec commit 77b3bdd

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,10 @@ task:
206206
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
207207

208208
task:
209-
name: '[TSan, depends, gui] [jammy]'
209+
name: '[TSan, depends, gui] [2404]'
210210
<< : *GLOBAL_TASK_TEMPLATE
211211
container:
212-
image: ubuntu:jammy
212+
image: ubuntu:24.04
213213
cpu: 6 # Increase CPU and Memory to avoid timeout
214214
memory: 24G
215215
env:

ci/test/00_setup_env_native_tsan.sh

Lines changed: 4 additions & 4 deletions
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="docker.io/ubuntu:24.04"
11+
export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libc++abi-18-dev libc++-18-dev python3-zmq"
12+
export DEP_OPTS="CC=clang-18 CXX='clang++-18 -stdlib=libc++'"
1313
export GOAL="install"
14-
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' CXXFLAGS='-g' --with-sanitizers=thread CC=clang-13 CXX='clang++-13 -stdlib=libc++'"
14+
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' CXXFLAGS='-g' --with-sanitizers=thread"

0 commit comments

Comments
 (0)