Skip to content

Commit a976777

Browse files
committed
ci: build multiprocess depends with Clang, use in tsan builds
1 parent c9708b7 commit a976777

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ jobs:
123123
src-linux64_tsan:
124124
name: linux64_tsan-build
125125
uses: ./.github/workflows/build-src.yml
126-
needs: [container, depends-linux64]
126+
needs: [container, depends-linux64_multiprocess]
127127
with:
128128
build-target: linux64_tsan
129129
container-path: ${{ needs.container.outputs.path }}
130-
depends-key: ${{ needs.depends-linux64.outputs.key }}
130+
depends-key: ${{ needs.depends-linux64_multiprocess.outputs.key }}
131131

132132
src-linux64_ubsan:
133133
name: linux64_ubsan-build

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ linux64_tsan-build:
276276
- .build-template
277277
- .skip-in-fast-mode-template
278278
needs:
279-
- x86_64-pc-linux-gnu_debug
279+
- x86_64-pc-linux-gnu_multiprocess
280280
variables:
281281
BUILD_TARGET: linux64_tsan
282282

ci/test/00_setup_env_native_multiprocess.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
99
export CONTAINER_NAME=ci_native_multiprocess
1010
export HOST=x86_64-pc-linux-gnu
1111
export PACKAGES="cmake python3 llvm clang"
12-
export DEP_OPTS="MULTIPROCESS=1"
12+
export DEP_OPTS="MULTIPROCESS=1 CC=clang-18 CXX=clang++-18"
1313
export GOAL="install"
1414
export TEST_RUNNER_EXTRA="--v2transport"
1515
export BITCOIN_CONFIG="--with-boost-process --enable-debug CC=clang-18 CXX=clang++-18" # Use clang to avoid OOM

0 commit comments

Comments
 (0)