From 37d520d22228512e5b08c43fb10771df92c6dee0 Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Sat, 31 Aug 2024 11:04:31 -0300 Subject: [PATCH] migrate `setup_environment.sh` to CMake Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> --- .github/actions/build-bitcoind/action.yml | 2 +- test/setup_environment.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/actions/build-bitcoind/action.yml b/.github/actions/build-bitcoind/action.yml index 0292d7ca4..ed4c5957c 100644 --- a/.github/actions/build-bitcoind/action.yml +++ b/.github/actions/build-bitcoind/action.yml @@ -23,7 +23,7 @@ runs: ccache --zero-stats cd test; ./setup_environment.sh --bitcoind; cd .. ccache --show-stats --verbose - tar -czf bitcoind.tar.gz test/work/bitcoin/src/bitcoind + tar -czf bitcoind.tar.gz test/work/bitcoin/build/src/bitcoind - uses: actions/cache/save@v4 if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true' diff --git a/test/setup_environment.sh b/test/setup_environment.sh index 6a3f948d3..eca894049 100755 --- a/test/setup_environment.sh +++ b/test/setup_environment.sh @@ -444,11 +444,10 @@ if [[ -n ${build_bitcoind} ]]; then # Build bitcoind. This is super slow, but it is cached so it runs fairly quickly. pushd depends - make NO_QT=1 NO_QR=1 NO_ZMQ=1 NO_UPNP=1 NO_NATPMP=1 + make NO_QT=1 NO_QR=1 NO_ZMQ=1 NO_UPNP=1 NO_NATPMP=1 NO_USDT=1 popd # Do the build - ./autogen.sh - CONFIG_SITE=$PWD/depends/x86_64-pc-linux-gnu/share/config.site ./configure --with-incompatible-bdb --with-miniupnpc=no --without-gui --disable-zmq --disable-tests --disable-bench --with-libs=no --with-utils=no - make src/bitcoind + cmake -B build --toolchain depends/x86_64-pc-linux-gnu/toolchain.cmake -DBUILD_TESTS=OFF -DBUILD_BENCH=OFF + cmake --build build --target bitcoind fi