Skip to content

Commit 94e37ef

Browse files
committed
ci: build and use sqlite and tsan depends
NOTE: no '-stdlib=libc++' in CXX for DEP_OPTS and BITCOIN_CONFIG for now
1 parent 139c785 commit 94e37ef

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,12 @@ jobs:
6969
build_target: linux64
7070
- depends_name: x86_64-pc-linux-gnu_multiprocess
7171
build_target: linux64_multiprocess
72+
- depends_name: x86_64-pc-linux-gnu_sqlite
73+
build_target: linux64_sqlite
7274
- depends_name: x86_64-pc-linux-gnu_nowallet
7375
build_target: linux64_nowallet
76+
- depends_name: x86_64-pc-linux-gnu_tsan
77+
build_target: linux64_tsan
7478
container:
7579
image: ghcr.io/${{ needs.build-image.outputs.repo-name }}/dashcore-ci-runner:${{ needs.build-image.outputs.image-tag }}
7680
options: --user root
@@ -137,9 +141,9 @@ jobs:
137141
- build_target: linux64_nowallet
138142
depends_name: x86_64-pc-linux-gnu_nowallet
139143
- build_target: linux64_sqlite
140-
depends_name: x86_64-pc-linux-gnu_debug
144+
depends_name: x86_64-pc-linux-gnu_sqlite
141145
- build_target: linux64_tsan
142-
depends_name: x86_64-pc-linux-gnu_debug
146+
depends_name: x86_64-pc-linux-gnu_tsan
143147
- build_target: linux64_ubsan
144148
depends_name: x86_64-pc-linux-gnu_debug
145149
container:

.gitlab-ci.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,27 @@ x86_64-pc-linux-gnu_nowallet:
206206
variables:
207207
BUILD_TARGET: linux64_nowallet
208208

209+
x86_64-pc-linux-gnu_sqlite:
210+
extends:
211+
- .build-depends-template
212+
- .skip-in-fast-mode-template
213+
variables:
214+
BUILD_TARGET: linux64_sqlite
215+
209216
x86_64-pc-linux-gnu_multiprocess:
210217
extends:
211218
- .build-depends-template
212219
- .skip-in-fast-mode-template
213220
variables:
214221
BUILD_TARGET: linux64_multiprocess
215222

223+
x86_64-pc-linux-gnu_tsan:
224+
extends:
225+
- .build-depends-template
226+
- .skip-in-fast-mode-template
227+
variables:
228+
BUILD_TARGET: linux64_tsan
229+
216230
x86_64-apple-darwin:
217231
extends:
218232
- .build-depends-template
@@ -259,7 +273,7 @@ linux64_sqlite-build:
259273
- .build-template
260274
- .skip-in-fast-mode-template
261275
needs:
262-
- x86_64-pc-linux-gnu_debug
276+
- x86_64-pc-linux-gnu_sqlite
263277
variables:
264278
BUILD_TARGET: linux64_sqlite
265279

@@ -286,7 +300,7 @@ linux64_tsan-build:
286300
- .build-template
287301
- .skip-in-fast-mode-template
288302
needs:
289-
- x86_64-pc-linux-gnu_multiprocess
303+
- x86_64-pc-linux-gnu_tsan
290304
variables:
291305
BUILD_TARGET: linux64_tsan
292306

ci/test/00_setup_env_native_tsan.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_tsan
1010
export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libc++abi-18-dev libc++-18-dev python3-zmq"
11-
export DEP_OPTS="CC=clang-18 CXX='clang++-18 -stdlib=libc++'"
11+
# NOTE: no '-stdlib=libc++' in CXX for DEP_OPTS and BITCOIN_CONFIG for now
12+
export DEP_OPTS="CC=clang-18 CXX=clang++-18"
1213
export TEST_RUNNER_EXTRA="--extended --exclude feature_pruning,feature_dbcrash,wallet_multiwallet.py" # Temporarily suppress ASan heap-use-after-free (see issue #14163)
1314
export TEST_RUNNER_EXTRA="${TEST_RUNNER_EXTRA} --timeout-factor=4" # Increase timeout because sanitizers slow down
1415
export GOAL="install"

0 commit comments

Comments
 (0)