Skip to content

Commit 2c03cec

Browse files
committed
ci: Build bitcoin-chainstate
...to make sure that the linker errors that arise from coupling regressions are caught by CI. Adding to the "no wallet" ci job as suggested by MarcoFalke.
1 parent 095aa6c commit 2c03cec

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@ task:
259259
FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh"
260260

261261
task:
262-
name: '[no wallet] [bionic]'
262+
name: '[no wallet, libbitcoinkernel] [bionic]'
263263
<< : *GLOBAL_TASK_TEMPLATE
264264
container:
265265
image: ubuntu:bionic
266266
env:
267267
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
268-
FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
268+
FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh"
269269

270270
task:
271271
name: 'macOS 10.15 [gui, no tests] [focal]'

ci/test/00_setup_env_native_nowallet.sh renamed to ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CONTAINER_NAME=ci_native_nowallet
9+
export CONTAINER_NAME=ci_native_nowallet_libbitcoinkernel
1010
export DOCKER_NAME_TAG=ubuntu:18.04 # Use bionic to have one config run the tests in python3.6, see doc/dependencies.md
1111
export PACKAGES="python3-zmq clang-7 llvm-7 libc++abi-7-dev libc++-7-dev" # Use clang-7 to test C++17 compatibility, see doc/dependencies.md
1212
export DEP_OPTS="NO_WALLET=1 CC=clang-7 CXX='clang++-7 -stdlib=libc++'"
1313
export GOAL="install"
14-
export BITCOIN_CONFIG="--enable-reduce-exports CC=clang-7 CXX='clang++-7 -stdlib=libc++'"
14+
export BITCOIN_CONFIG="--enable-reduce-exports CC=clang-7 CXX='clang++-7 -stdlib=libc++' --enable-experimental-util-chainstate"

src/Makefile.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,10 @@ bitcoin_chainstate_LDADD = \
853853
$(LIBLEVELDB) \
854854
$(LIBLEVELDB_SSE42) \
855855
$(LIBMEMENV)
856+
857+
# Required for obj/build.h to be generated first.
858+
# More details: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html
859+
bitcoin_chainstate-clientversion.$(OBJEXT): obj/build.h
856860
#
857861

858862
# bitcoinconsensus library #

0 commit comments

Comments
 (0)