diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2005c22b50..0c369553a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,8 +62,10 @@ jobs:
- name: Install Homebrew packages
run: brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
- - name: Set Ccache directory
- run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
+ - name: Set environment variables
+ run: |
+ echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
+ echo "IN_GETOPT_BIN=$(brew --prefix gnu-getopt)/bin/getopt" >> "$GITHUB_ENV"
- name: Restore Ccache cache
uses: actions/cache/restore@v4
@@ -105,37 +107,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- - name: Fix Visual Studio installation
- # See: https://github.com/actions/runner-images/issues/7832#issuecomment-1617585694.
- run: |
- Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
- $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
- $componentsToRemove= @(
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64"
- "Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre"
- )
- [string]$workloadArgs = $componentsToRemove | ForEach-Object {" --remove " + $_}
- $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
- # should be run twice
- $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
- $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
-
- name: Configure Developer Command Prompt for Microsoft Visual C++
# Using microsoft/setup-msbuild is not enough.
uses: ilammy/msvc-dev-cmd@v1
@@ -266,9 +237,6 @@ jobs:
- name: Run unit tests
run: src\test_bitcoin.exe -l test_suite
- - name: Run benchmarks
- run: src\bench_bitcoin.exe -sanity-check
-
- name: Run util tests
run: py -3 test\util\test_runner.py
diff --git a/build_msvc/bitcoin_config.h.in b/build_msvc/bitcoin_config.h.in
index 1716647486..ec69307f50 100644
--- a/build_msvc/bitcoin_config.h.in
+++ b/build_msvc/bitcoin_config.h.in
@@ -41,9 +41,6 @@
/* Define this symbol to enable ZMQ functions */
#define ENABLE_ZMQ 1
-/* define if external signer support is enabled (requires Boost::Process) */
-#define ENABLE_EXTERNAL_SIGNER /**/
-
/* Define to 1 if you have the declaration of `be16toh', and to 0 if you
don't. */
#define HAVE_DECL_BE16TOH 0
diff --git a/build_msvc/bitcoind/bitcoind.vcxproj b/build_msvc/bitcoind/bitcoind.vcxproj
index bb61865e14..8d9b645070 100644
--- a/build_msvc/bitcoind/bitcoind.vcxproj
+++ b/build_msvc/bitcoind/bitcoind.vcxproj
@@ -82,7 +82,7 @@
+ Replace="@ENABLE_EXTERNAL_SIGNER_TRUE@" By="#">
diff --git a/build_msvc/vcpkg.json b/build_msvc/vcpkg.json
index 3557269be0..c640c59ebd 100644
--- a/build_msvc/vcpkg.json
+++ b/build_msvc/vcpkg.json
@@ -3,8 +3,8 @@
"version-string": "1",
"dependencies": [
"berkeleydb",
+ "boost-date-time",
"boost-multi-index",
- "boost-process",
"boost-signals2",
"boost-test",
"sqlite3",
@@ -14,7 +14,7 @@
},
"zeromq"
],
- "builtin-baseline": "f14984af3738e69f197bf0e647a8dca12de92996",
+ "builtin-baseline": "9edb1b8e590cc086563301d735cae4b6e732d2d2",
"overrides": [
{
"name": "libevent",
diff --git a/ci/test/00_setup_env_mac_native.sh b/ci/test/00_setup_env_mac_native.sh
index c9f65bf397..b1cae5392f 100755
--- a/ci/test/00_setup_env_mac_native.sh
+++ b/ci/test/00_setup_env_mac_native.sh
@@ -14,5 +14,3 @@ export CI_OS_NAME="macos"
export NO_DEPENDS=1
export OSX_SDK=""
export CCACHE_MAXSIZE=400M
-export RUN_FUZZ_TESTS=true
-export FUZZ_TESTS_CONFIG="--exclude banman" # https://github.com/bitcoin/bitcoin/issues/27924
diff --git a/configure.ac b/configure.ac
index a7902abbea..cd3a218e36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1520,9 +1520,19 @@ if test "$use_external_signer" != "no"; then
CXXFLAGS="$TEMP_CXXFLAGS"
AC_MSG_RESULT([$have_boost_process])
if test "$have_boost_process" = "yes"; then
- use_external_signer="yes"
- AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
- AC_DEFINE([BOOST_PROCESS_USE_STD_FS], [1], [Defined to avoid Boost::Process trying to use Boost Filesystem])
+ case $host in
+ dnl Boost Process for Windows uses Boost ASIO. Boost ASIO performs
+ dnl pre-main init of Windows networking libraries, which we do not
+ dnl want.
+ *mingw*)
+ use_external_signer="no"
+ ;;
+ *)
+ use_external_signer="yes"
+ AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
+ AC_DEFINE([BOOST_PROCESS_USE_STD_FS], [1], [Defined to avoid Boost::Process trying to use Boost Filesystem])
+ ;;
+ esac
else
if test "$use_external_signer" = "yes"; then
AC_MSG_ERROR([External signing is not supported for this Boost version])