diff options
| author | Carl Dong <contact@carldong.me> | 2022-02-10 16:08:07 -0500 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2022-02-14 14:54:01 -0500 |
| commit | 2c03cec2ff8cdbfd5da92bfb507d218e5c6435b0 (patch) | |
| tree | a9d46ae389a94b398f581f6dbae671720979bfa1 | |
| parent | 095aa6ca37bf0bd5c5e221bab779978a99b2a34c (diff) | |
| download | bitcoin-2c03cec2ff8cdbfd5da92bfb507d218e5c6435b0.tar.xz | |
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.
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rwxr-xr-x | ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh (renamed from ci/test/00_setup_env_native_nowallet.sh) | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 5624c97d56..dea85f7ff5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -259,13 +259,13 @@ task: FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh" task: - name: '[no wallet] [bionic]' + name: '[no wallet, libbitcoinkernel] [bionic]' << : *GLOBAL_TASK_TEMPLATE container: image: ubuntu:bionic env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV - FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh" + FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh" task: name: 'macOS 10.15 [gui, no tests] [focal]' diff --git a/ci/test/00_setup_env_native_nowallet.sh b/ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh index d80a7f9633..89d6256298 100755 --- a/ci/test/00_setup_env_native_nowallet.sh +++ b/ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh @@ -6,9 +6,9 @@ export LC_ALL=C.UTF-8 -export CONTAINER_NAME=ci_native_nowallet +export CONTAINER_NAME=ci_native_nowallet_libbitcoinkernel export DOCKER_NAME_TAG=ubuntu:18.04 # Use bionic to have one config run the tests in python3.6, see doc/dependencies.md 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 export DEP_OPTS="NO_WALLET=1 CC=clang-7 CXX='clang++-7 -stdlib=libc++'" export GOAL="install" -export BITCOIN_CONFIG="--enable-reduce-exports CC=clang-7 CXX='clang++-7 -stdlib=libc++'" +export BITCOIN_CONFIG="--enable-reduce-exports CC=clang-7 CXX='clang++-7 -stdlib=libc++' --enable-experimental-util-chainstate" diff --git a/src/Makefile.am b/src/Makefile.am index 95a76b4c9e..ac6524909a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -853,6 +853,10 @@ bitcoin_chainstate_LDADD = \ $(LIBLEVELDB) \ $(LIBLEVELDB_SSE42) \ $(LIBMEMENV) + +# Required for obj/build.h to be generated first. +# More details: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html +bitcoin_chainstate-clientversion.$(OBJEXT): obj/build.h # # bitcoinconsensus library # |