Skip to content

Commit

Permalink
Merge branch 'auxpow-26.x' into 26.x
Browse files Browse the repository at this point in the history
  • Loading branch information
domob1812 committed Apr 1, 2024
2 parents 1225531 + e953f18 commit f6a846e
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 25 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion ci/test/00_setup_env_mac_native.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
export LC_ALL=C.UTF-8

export HOST=x86_64-apple-darwin
export PIP_PACKAGES="zmq"
# Homebrew's [email protected] 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"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
6 changes: 3 additions & 3 deletions doc/man/namecoin-cli.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1.
.TH NAMECOIN-CLI "1" "March 2024" "namecoin-cli v26.1.0rc2" "User Commands"
.TH NAMECOIN-CLI "1" "April 2024" "namecoin-cli v26.1.0" "User Commands"
.SH NAME
namecoin-cli \- manual page for namecoin-cli v26.1.0rc2
namecoin-cli \- manual page for namecoin-cli v26.1.0
.SH SYNOPSIS
.B namecoin-cli
[\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR] \fI\,Send command to Namecoin Core\/\fR
Expand All @@ -15,7 +15,7 @@ namecoin-cli \- manual page for namecoin-cli v26.1.0rc2
.B namecoin-cli
[\fI\,options\/\fR] \fI\,help <command> Get help for a command\/\fR
.SH DESCRIPTION
Namecoin Core RPC client version v26.1.0rc2
Namecoin Core RPC client version v26.1.0
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/namecoin-qt.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1.
.TH NAMECOIN-QT "1" "March 2024" "namecoin-qt v26.1.0rc2" "User Commands"
.TH NAMECOIN-QT "1" "April 2024" "namecoin-qt v26.1.0" "User Commands"
.SH NAME
namecoin-qt \- manual page for namecoin-qt v26.1.0rc2
namecoin-qt \- manual page for namecoin-qt v26.1.0
.SH SYNOPSIS
.B namecoin-qt
[\fI\,command-line options\/\fR]
.SH DESCRIPTION
Namecoin Core version v26.1.0rc2
Namecoin Core version v26.1.0
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/namecoin-tx.1
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1.
.TH NAMECOIN-TX "1" "March 2024" "namecoin-tx v26.1.0rc2" "User Commands"
.TH NAMECOIN-TX "1" "April 2024" "namecoin-tx v26.1.0" "User Commands"
.SH NAME
namecoin-tx \- manual page for namecoin-tx v26.1.0rc2
namecoin-tx \- manual page for namecoin-tx v26.1.0
.SH SYNOPSIS
.B namecoin-tx
[\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR] \fI\,Update hex-encoded transaction\/\fR
.br
.B namecoin-tx
[\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR] \fI\,Create hex-encoded transaction\/\fR
.SH DESCRIPTION
Namecoin Core namecoin\-tx utility version v26.1.0rc2
Namecoin Core namecoin\-tx utility version v26.1.0
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/namecoin-util.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1.
.TH NAMECOIN-UTIL "1" "March 2024" "namecoin-util v26.1.0rc2" "User Commands"
.TH NAMECOIN-UTIL "1" "April 2024" "namecoin-util v26.1.0" "User Commands"
.SH NAME
namecoin-util \- manual page for namecoin-util v26.1.0rc2
namecoin-util \- manual page for namecoin-util v26.1.0
.SH SYNOPSIS
.B bitcoin-util
[\fI\,options\/\fR] [\fI\,commands\/\fR] \fI\,Do stuff\/\fR
.SH DESCRIPTION
Namecoin Core bitcoin\-util utility version v26.1.0rc2
Namecoin Core bitcoin\-util utility version v26.1.0
.SH OPTIONS
.HP
\-?
Expand Down
6 changes: 3 additions & 3 deletions doc/man/namecoin-wallet.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1.
.TH NAMECOIN-WALLET "1" "March 2024" "namecoin-wallet v26.1.0rc2" "User Commands"
.TH NAMECOIN-WALLET "1" "April 2024" "namecoin-wallet v26.1.0" "User Commands"
.SH NAME
namecoin-wallet \- manual page for namecoin-wallet v26.1.0rc2
namecoin-wallet \- manual page for namecoin-wallet v26.1.0
.SH DESCRIPTION
Namecoin Core namecoin\-wallet version v26.1.0rc2
Namecoin Core namecoin\-wallet version v26.1.0
.PP
namecoin\-wallet is an offline tool for creating and interacting with Namecoin Core wallet files.
By default namecoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.
Expand Down
6 changes: 3 additions & 3 deletions doc/man/namecoind.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1.
.TH NAMECOIND "1" "March 2024" "namecoind v26.1.0rc2" "User Commands"
.TH NAMECOIND "1" "April 2024" "namecoind v26.1.0" "User Commands"
.SH NAME
namecoind \- manual page for namecoind v26.1.0rc2
namecoind \- manual page for namecoind v26.1.0
.SH SYNOPSIS
.B namecoind
[\fI\,options\/\fR] \fI\,Start Namecoin Core\/\fR
.SH DESCRIPTION
Namecoin Core version v26.1.0rc2
Namecoin Core version v26.1.0
.SH OPTIONS
.HP
\-?
Expand Down
9 changes: 5 additions & 4 deletions doc/release-notes.md
Original file line number Diff line number Diff line change
@@ -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:

<https://bitcoincore.org/bin/bitcoin-core-26.1/test.rc1/>
<https://bitcoincore.org/bin/bitcoin-core-26.1/>

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:
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit f6a846e

Please sign in to comment.