From 324e56239960308333ac9e46f1c815020f0b149f Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sun, 10 Mar 2024 13:08:42 +0000 Subject: [PATCH 1/5] ci: Add workaround for Homebrew's python link error Promoting Homebrew's python@3.12 to the default python3 breaks symbolic links on macOS x86_64. This change adds a workaround for that issue. Also see: https://github.com/actions/runner-images/issues/9471 etc. Github-Pull: #29610 Rebased-From: ae5f72027f1776f815a6637c594f0f725a6ccb55 --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 702255ea516af..d8fa7f9a689e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,7 +96,10 @@ jobs: - name: Install Homebrew packages env: HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1 - run: brew install automake libtool pkg-config gnu-getopt ccache boost libevent miniupnpc libnatpmp zeromq qt@5 qrencode + run: | + # A workaround for "The `brew link` step did not complete successfully" error. + brew install python@3 || brew link --overwrite python@3 + brew install automake libtool pkg-config gnu-getopt ccache boost libevent miniupnpc libnatpmp zeromq qt@5 qrencode - name: Set Ccache directory run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV" From b53bf22c722309cba923b90840c1e48b98f553c9 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sun, 10 Mar 2024 13:09:03 +0000 Subject: [PATCH 2/5] ci, macos: Use `--break-system-packages` with Homebrew's python Homebrew's python@3.12 is marked as externally managed (PEP 668), necessitating different approaches for installing Python packages. For more details, please refer to https://github.com/orgs/Homebrew/discussions/3404. Github-Pull: #29610 Rebased-From: acc06bc91f80ddf4e015dcdf0b984bbdbfcb5ca3 --- ci/test/00_setup_env_mac_native.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/test/00_setup_env_mac_native.sh b/ci/test/00_setup_env_mac_native.sh index c9f65bf397beb..d9f831e4c5f99 100755 --- a/ci/test/00_setup_env_mac_native.sh +++ b/ci/test/00_setup_env_mac_native.sh @@ -7,7 +7,9 @@ export LC_ALL=C.UTF-8 export HOST=x86_64-apple-darwin -export PIP_PACKAGES="zmq" +# Homebrew's python@3.12 is marked as externally managed (PEP 668). +# Therefore, `--break-system-packages` is needed. +export PIP_PACKAGES="--break-system-packages zmq" export GOAL="install" export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports" export CI_OS_NAME="macos" From 5f06dcf9c9481ab8f034aece447e12da67ab7ce7 Mon Sep 17 00:00:00 2001 From: glozow Date: Mon, 25 Mar 2024 08:52:36 +0000 Subject: [PATCH 3/5] [build] bump version to 26.1 final --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 56ea874b6bc9d..5a7baf2a771ab 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 26) define(_CLIENT_VERSION_MINOR, 1) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 2) +define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2023) define(_COPYRIGHT_HOLDERS,[The %s developers]) From 785242dd4ca5b05155f67a8ab097dc35ee183559 Mon Sep 17 00:00:00 2001 From: glozow Date: Mon, 25 Mar 2024 08:54:44 +0000 Subject: [PATCH 4/5] [doc] update release notes 26.1 --- doc/release-notes.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/release-notes.md b/doc/release-notes.md index bd4d3d548f8dc..cb64d1bbe83ea 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -1,11 +1,11 @@ -26.1rc1 Release Notes +26.1 Release Notes ================== -Bitcoin Core version 26.1rc1 is now available from: +Bitcoin Core version 26.1 is now available from: - + -This release includes new features, various bug fixes and performance +This release includes various bug fixes and performance improvements, as well as updated translations. Please report bugs using the issue tracker at GitHub: @@ -71,6 +71,7 @@ Notable changes - #28992 ci: Use Ubuntu 24.04 Noble for asan,tsan,tidy,fuzz - #29080 ci: Set HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK to avoid unrelated failures +- #29610 ci: Fix "macOS native" job ### Miscellaneous From cc0553d0d666a6ad5cdd3b88ddb06af883b6d7a1 Mon Sep 17 00:00:00 2001 From: glozow Date: Mon, 25 Mar 2024 08:57:38 +0000 Subject: [PATCH 5/5] [doc] add manual pages for 26.1 --- doc/man/bitcoin-cli.1 | 6 +++--- doc/man/bitcoin-qt.1 | 6 +++--- doc/man/bitcoin-tx.1 | 6 +++--- doc/man/bitcoin-util.1 | 6 +++--- doc/man/bitcoin-wallet.1 | 6 +++--- doc/man/bitcoind.1 | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1 index 4f6a81b50ef5c..d07e853e9e9da 100644 --- a/doc/man/bitcoin-cli.1 +++ b/doc/man/bitcoin-cli.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH BITCOIN-CLI "1" "March 2024" "bitcoin-cli v26.1.0rc2" "User Commands" +.TH BITCOIN-CLI "1" "March 2024" "bitcoin-cli v26.1.0" "User Commands" .SH NAME -bitcoin-cli \- manual page for bitcoin-cli v26.1.0rc2 +bitcoin-cli \- manual page for bitcoin-cli v26.1.0 .SH SYNOPSIS .B bitcoin-cli [\fI\,options\/\fR] \fI\, \/\fR[\fI\,params\/\fR] \fI\,Send command to Bitcoin Core\/\fR @@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v26.1.0rc2 .B bitcoin-cli [\fI\,options\/\fR] \fI\,help Get help for a command\/\fR .SH DESCRIPTION -Bitcoin Core RPC client version v26.1.0rc2 +Bitcoin Core RPC client version v26.1.0 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1 index 179588f4ce3ef..7f5185415e53c 100644 --- a/doc/man/bitcoin-qt.1 +++ b/doc/man/bitcoin-qt.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH BITCOIN-QT "1" "March 2024" "bitcoin-qt v26.1.0rc2" "User Commands" +.TH BITCOIN-QT "1" "March 2024" "bitcoin-qt v26.1.0" "User Commands" .SH NAME -bitcoin-qt \- manual page for bitcoin-qt v26.1.0rc2 +bitcoin-qt \- manual page for bitcoin-qt v26.1.0 .SH SYNOPSIS .B bitcoin-qt [\fI\,command-line options\/\fR] .SH DESCRIPTION -Bitcoin Core version v26.1.0rc2 +Bitcoin Core version v26.1.0 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1 index 8b06d4b587990..aa863d4b907bc 100644 --- a/doc/man/bitcoin-tx.1 +++ b/doc/man/bitcoin-tx.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH BITCOIN-TX "1" "March 2024" "bitcoin-tx v26.1.0rc2" "User Commands" +.TH BITCOIN-TX "1" "March 2024" "bitcoin-tx v26.1.0" "User Commands" .SH NAME -bitcoin-tx \- manual page for bitcoin-tx v26.1.0rc2 +bitcoin-tx \- manual page for bitcoin-tx v26.1.0 .SH SYNOPSIS .B bitcoin-tx [\fI\,options\/\fR] \fI\, \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded bitcoin transaction\/\fR @@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v26.1.0rc2 .B bitcoin-tx [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded bitcoin transaction\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-tx utility version v26.1.0rc2 +Bitcoin Core bitcoin\-tx utility version v26.1.0 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-util.1 b/doc/man/bitcoin-util.1 index 260cb592e8856..d7db89571bd65 100644 --- a/doc/man/bitcoin-util.1 +++ b/doc/man/bitcoin-util.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH BITCOIN-UTIL "1" "March 2024" "bitcoin-util v26.1.0rc2" "User Commands" +.TH BITCOIN-UTIL "1" "March 2024" "bitcoin-util v26.1.0" "User Commands" .SH NAME -bitcoin-util \- manual page for bitcoin-util v26.1.0rc2 +bitcoin-util \- manual page for bitcoin-util v26.1.0 .SH SYNOPSIS .B bitcoin-util [\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR .SH DESCRIPTION -Bitcoin Core bitcoin\-util utility version v26.1.0rc2 +Bitcoin Core bitcoin\-util utility version v26.1.0 .SH OPTIONS .HP \-? diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1 index 266a6305c8936..af59992b9f2b8 100644 --- a/doc/man/bitcoin-wallet.1 +++ b/doc/man/bitcoin-wallet.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH BITCOIN-WALLET "1" "March 2024" "bitcoin-wallet v26.1.0rc2" "User Commands" +.TH BITCOIN-WALLET "1" "March 2024" "bitcoin-wallet v26.1.0" "User Commands" .SH NAME -bitcoin-wallet \- manual page for bitcoin-wallet v26.1.0rc2 +bitcoin-wallet \- manual page for bitcoin-wallet v26.1.0 .SH DESCRIPTION -Bitcoin Core bitcoin\-wallet version v26.1.0rc2 +Bitcoin Core bitcoin\-wallet version v26.1.0 .PP bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files. By default bitcoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir. diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1 index d22dde22bf7aa..e2b3c540466fd 100644 --- a/doc/man/bitcoind.1 +++ b/doc/man/bitcoind.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH BITCOIND "1" "March 2024" "bitcoind v26.1.0rc2" "User Commands" +.TH BITCOIND "1" "March 2024" "bitcoind v26.1.0" "User Commands" .SH NAME -bitcoind \- manual page for bitcoind v26.1.0rc2 +bitcoind \- manual page for bitcoind v26.1.0 .SH SYNOPSIS .B bitcoind [\fI\,options\/\fR] \fI\,Start Bitcoin Core\/\fR .SH DESCRIPTION -Bitcoin Core version v26.1.0rc2 +Bitcoin Core version v26.1.0 .SH OPTIONS .HP \-?