From 0c74bce09e62064b703ede1823b085ab68f4692a Mon Sep 17 00:00:00 2001 From: rustaceanrob Date: Sat, 16 May 2026 11:54:37 +0100 Subject: [PATCH] build, ci: Remove IPC configuration and install `capnp` on runners --- .github/workflows/ci.yml | 4 ++-- CMakeLists.txt | 6 ------ .../{00_setup_env_i686_no_ipc.sh => 00_setup_env_i686.sh} | 5 ++--- ci/test/00_setup_env_mac_cross.sh | 2 +- ci/test/00_setup_env_mac_cross_intel.sh | 2 +- ci/test/00_setup_env_mac_native.sh | 2 +- ci/test/00_setup_env_win64.sh | 1 - ci/test/00_setup_env_win64_msvcrt.sh | 1 - cmake/module/GenerateSetupNsi.cmake | 1 - cmake/module/Maintenance.cmake | 3 +-- doc/release-notes/release-notes-30.0.md | 4 +--- share/setup.nsi.in | 1 - test/CMakeLists.txt | 1 - test/config.ini.in | 2 +- vcpkg.json | 1 + 15 files changed, 11 insertions(+), 25 deletions(-) rename ci/test/{00_setup_env_i686_no_ipc.sh => 00_setup_env_i686.sh} (87%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 693842bc0aa5..9b256a52082e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -485,11 +485,11 @@ jobs: timeout-minutes: 120 file-env: './ci/test/00_setup_env_freebsd_cross.sh' - - name: 'i686, no IPC' + - name: 'i686' cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md' fallback-runner: 'ubuntu-24.04' timeout-minutes: 120 - file-env: './ci/test/00_setup_env_i686_no_ipc.sh' + file-env: './ci/test/00_setup_env_i686.sh' - name: 'fuzzer,address,undefined,integer' cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg' diff --git a/CMakeLists.txt b/CMakeLists.txt index 42f209e36b56..bccd308d7dee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -599,12 +599,6 @@ message(" libbitcoinkernel (experimental) ..... ${BUILD_KERNEL_LIB}") message(" kernel-test (experimental) .......... ${BUILD_KERNEL_TEST}") message("Optional features:") message(" ZeroMQ .............................. ${WITH_ZMQ}") -if(WITH_EXTERNAL_LIBMULTIPROCESS) - set(ipc_status "ON (with external libmultiprocess)") -else() - set(ipc_status ON) -endif() -message(" IPC ................................. ${ipc_status}") message(" Embedded ASMap ...................... ${WITH_EMBEDDED_ASMAP}") message(" USDT tracing ........................ ${WITH_USDT}") message("Tests:") diff --git a/ci/test/00_setup_env_i686_no_ipc.sh b/ci/test/00_setup_env_i686.sh similarity index 87% rename from ci/test/00_setup_env_i686_no_ipc.sh rename to ci/test/00_setup_env_i686.sh index 93d5ab744604..fce4a16e4b70 100755 --- a/ci/test/00_setup_env_i686_no_ipc.sh +++ b/ci/test/00_setup_env_i686.sh @@ -7,17 +7,16 @@ export LC_ALL=C.UTF-8 export HOST=i686-pc-linux-gnu -export CONTAINER_NAME=ci_i686_no_multiprocess +export CONTAINER_NAME=ci_i686 export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie" export CI_IMAGE_PLATFORM="linux/amd64" export CI_CONTAINER_CAP="--security-opt seccomp=unconfined" export PACKAGES="llvm clang g++-multilib" -export DEP_OPTS="DEBUG=1 NO_IPC=1" +export DEP_OPTS="DEBUG=1" export GOAL="install" export CI_LIMIT_STACK_SIZE=1 export BITCOIN_CONFIG="\ --preset=dev-mode \ - -DENABLE_IPC=OFF \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_C_COMPILER='clang;-m32' \ -DCMAKE_CXX_COMPILER='clang++;-m32' \ diff --git a/ci/test/00_setup_env_mac_cross.sh b/ci/test/00_setup_env_mac_cross.sh index 63d89fb9b927..f872db645198 100755 --- a/ci/test/00_setup_env_mac_cross.sh +++ b/ci/test/00_setup_env_mac_cross.sh @@ -16,7 +16,7 @@ export XCODE_VERSION=26.1.1 export XCODE_BUILD_ID=17B100 export RUN_UNIT_TESTS=false export RUN_FUNCTIONAL_TESTS=false -export GOAL="deploy" +export GOAL="install" export BITCOIN_CONFIG="\ --preset=dev-mode \ -DWITH_USDT=OFF \ diff --git a/ci/test/00_setup_env_mac_cross_intel.sh b/ci/test/00_setup_env_mac_cross_intel.sh index 4b07e14b8195..5eed3aa122c3 100755 --- a/ci/test/00_setup_env_mac_cross_intel.sh +++ b/ci/test/00_setup_env_mac_cross_intel.sh @@ -16,7 +16,7 @@ export XCODE_VERSION=26.1.1 export XCODE_BUILD_ID=17B100 export RUN_UNIT_TESTS=false export RUN_FUNCTIONAL_TESTS=false -export GOAL="deploy" +export GOAL="install" export BITCOIN_CONFIG="\ --preset=dev-mode \ -DWITH_USDT=OFF \ diff --git a/ci/test/00_setup_env_mac_native.sh b/ci/test/00_setup_env_mac_native.sh index a9b4d5c8c2e5..a762b6bcdc5b 100755 --- a/ci/test/00_setup_env_mac_native.sh +++ b/ci/test/00_setup_env_mac_native.sh @@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME="ci_mac_native" # macos does not use a container, but the env var is needed for logging export PIP_PACKAGES="--break-system-packages pycapnp zmq" -export GOAL="install deploy" +export GOAL="install" export CMAKE_GENERATOR="Ninja" export CI_OS_NAME="macos" export NO_DEPENDS=1 diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index dbbf55c14781..b9f0991d60b6 100755 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -15,7 +15,6 @@ export RUN_FUNCTIONAL_TESTS=false export GOAL="deploy" export BITCOIN_CONFIG="\ --preset=dev-mode \ - -DENABLE_IPC=OFF \ -DWITH_USDT=OFF \ -DREDUCE_EXPORTS=ON \ -DCMAKE_CXX_FLAGS='-Wno-error=maybe-uninitialized' \ diff --git a/ci/test/00_setup_env_win64_msvcrt.sh b/ci/test/00_setup_env_win64_msvcrt.sh index 6c948aeb351e..6dcb0d4194a8 100755 --- a/ci/test/00_setup_env_win64_msvcrt.sh +++ b/ci/test/00_setup_env_win64_msvcrt.sh @@ -15,7 +15,6 @@ export RUN_FUNCTIONAL_TESTS=false export GOAL="deploy" export BITCOIN_CONFIG="\ --preset=dev-mode \ - -DENABLE_IPC=OFF \ -DWITH_USDT=OFF \ -DREDUCE_EXPORTS=ON \ -DCMAKE_CXX_FLAGS='-Wno-error=maybe-uninitialized' \ diff --git a/cmake/module/GenerateSetupNsi.cmake b/cmake/module/GenerateSetupNsi.cmake index 6397237f9eb6..a436ce0ae657 100644 --- a/cmake/module/GenerateSetupNsi.cmake +++ b/cmake/module/GenerateSetupNsi.cmake @@ -11,7 +11,6 @@ function(generate_setup_nsi) set(BITCOIN_DAEMON_NAME "bitcoind") set(BITCOIN_CLI_NAME "bitcoin-cli") set(BITCOIN_TX_NAME "bitcoin-tx") - set(BITCOIN_WALLET_TOOL_NAME "bitcoin-wallet") set(BITCOIN_TEST_NAME "test_bitcoin") set(EXEEXT ${CMAKE_EXECUTABLE_SUFFIX}) configure_file(${PROJECT_SOURCE_DIR}/share/setup.nsi.in ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi USE_SOURCE_PERMISSIONS @ONLY) diff --git a/cmake/module/Maintenance.cmake b/cmake/module/Maintenance.cmake index cfb1cc4f788f..7570fe28f36e 100644 --- a/cmake/module/Maintenance.cmake +++ b/cmake/module/Maintenance.cmake @@ -19,7 +19,7 @@ function(setup_split_debug_script) endfunction() function(add_windows_deploy_target) - if(MINGW AND TARGET bitcoin AND TARGET bitcoind AND TARGET bitcoin-cli AND TARGET bitcoin-tx AND TARGET bitcoin-wallet AND TARGET bitcoin-util AND TARGET test_bitcoin) + if(MINGW AND TARGET bitcoin AND TARGET bitcoind AND TARGET bitcoin-cli AND TARGET bitcoin-tx AND TARGET bitcoin-util AND TARGET test_bitcoin) find_program(MAKENSIS_EXECUTABLE makensis) if(NOT MAKENSIS_EXECUTABLE) add_custom_target(deploy @@ -39,7 +39,6 @@ function(add_windows_deploy_target) COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ - COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ COMMAND ${CMAKE_STRIP} $ -o ${PROJECT_BINARY_DIR}/release/$ COMMAND ${MAKENSIS_EXECUTABLE} -V2 ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi diff --git a/doc/release-notes/release-notes-30.0.md b/doc/release-notes/release-notes-30.0.md index a855d10cc98c..21a378be15bf 100644 --- a/doc/release-notes/release-notes-30.0.md +++ b/doc/release-notes/release-notes-30.0.md @@ -128,9 +128,7 @@ IPC Mining Interface (`bitcoin-node` instead of `bitcoind`) and is currently required but will become optional in the future (with [#33229](https://github.com/bitcoin/bitcoin/pull/33229)). -- IPC connectivity introduces new dependencies (see [multiprocess.md](https://github.com/bitcoin/bitcoin/blob/master/doc/multiprocess.md)), - which can be turned off with the `-DENABLE_IPC=OFF` build option if you do not intend - to use IPC. (#31802) +- IPC connectivity introduces new dependencies (see [multiprocess.md](https://github.com/bitcoin/bitcoin/blob/master/doc/multiprocess.md)). (#31802) Install changes --------------- diff --git a/share/setup.nsi.in b/share/setup.nsi.in index 8497d91a94ad..e71daa37e81c 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -82,7 +82,6 @@ Section -Main SEC0000 File @abs_top_builddir@/release/@BITCOIN_DAEMON_NAME@@EXEEXT@ File @abs_top_builddir@/release/@BITCOIN_CLI_NAME@@EXEEXT@ File @abs_top_builddir@/release/@BITCOIN_TX_NAME@@EXEEXT@ - File @abs_top_builddir@/release/@BITCOIN_WALLET_TOOL_NAME@@EXEEXT@ File @abs_top_builddir@/release/@BITCOIN_TEST_NAME@@EXEEXT@ SetOutPath $INSTDIR WriteRegStr HKCU "${REGKEY}\Components" Main 1 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index df2820646d8a..4473dc6ae8cd 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -25,7 +25,6 @@ function(create_test_config) set_configure_variable(WITH_ZMQ ENABLE_ZMQ) set_configure_variable(WITH_EMBEDDED_ASMAP ENABLE_EMBEDDED_ASMAP) set_configure_variable(WITH_USDT ENABLE_USDT_TRACEPOINTS) - set(ENABLE_IPC_TRUE "") configure_file(config.ini.in config.ini USE_SOURCE_PERMISSIONS @ONLY) endfunction() diff --git a/test/config.ini.in b/test/config.ini.in index 4b4154812492..7f1e2f677a0a 100644 --- a/test/config.ini.in +++ b/test/config.ini.in @@ -25,4 +25,4 @@ RPCAUTH=@abs_top_srcdir@/share/rpcauth/rpcauth.py @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=true @ENABLE_EMBEDDED_ASMAP_TRUE@ENABLE_EMBEDDED_ASMAP=true @ENABLE_USDT_TRACEPOINTS_TRUE@ENABLE_USDT_TRACEPOINTS=true -@ENABLE_IPC_TRUE@ENABLE_IPC=true +ENABLE_IPC=true diff --git a/vcpkg.json b/vcpkg.json index 1106203004c3..f30a51f2d3f5 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -4,6 +4,7 @@ "builtin-baseline": "120deac3062162151622ca4860575a33844ba10b", "dependencies": [ "boost-multi-index", + "capnproto", "libevent" ], "default-features": [