Skip to content

Commit fe47ae1

Browse files
author
MarcoFalke
committed
Merge #16080: build/doc: update bitcoin_config.h packages, release process
8afca32 doc: add bitcoin_config.h PACKAGE updates to release process (Jon Atack) 3ee28c5 build: bump bitcoin_config.h packages to v0.18 (Jon Atack) Pull request description: - Bump PACKAGE_VERSION and PACKAGE_STRING in `build_msvc/bitcoin_config.h` from 0.17 to 0.18 (follow-up to 48ed65b). - Update `doc/release_process.md` (follow-up to e47dc4f), new version visible [here](https://github.com/jonatack/bitcoin/blob/bitcoin_config-and-release_process-updates/doc/release-process.md). - Perhaps worth backporting the version updates to 0.18.0. ACKs for commit 8afca3: laanwj: utACK bitcoin/bitcoin@8afca32 Tree-SHA512: be4308636846d719d2406790b33861a5ca4775cec77b7b40f2a01e0180d55e36d821b680c923c366de6ddb576f8a94efe59bf66a5f0637cbc2ecff6c824fe602
2 parents 65c4bbe + 8afca32 commit fe47ae1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

build_msvc/bitcoin_config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
#define PACKAGE_NAME "Bitcoin Core"
347347

348348
/* Define to the full name and version of this package. */
349-
#define PACKAGE_STRING "Bitcoin Core 0.17.99"
349+
#define PACKAGE_STRING "Bitcoin Core 0.18.99"
350350

351351
/* Define to the one symbol short name of this package. */
352352
#define PACKAGE_TARNAME "bitcoin"
@@ -355,7 +355,7 @@
355355
#define PACKAGE_URL "https://bitcoincore.org/"
356356

357357
/* Define to the version of this package. */
358-
#define PACKAGE_VERSION "0.17.99"
358+
#define PACKAGE_VERSION "0.18.99"
359359

360360
/* Define to necessary symbol if this constant uses a non-standard name on
361361
your system. */

doc/release-process.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ Release Process
2727
* Update [`src/chainparams.cpp`](/src/chainparams.cpp) m_assumed_blockchain_size and m_assumed_chain_state_size with the current size plus some overhead.
2828
* Update `src/chainparams.cpp` chainTxData with statistics about the transaction count and rate. Use the output of the RPC `getchaintxstats`, see
2929
[this pull request](https://github.com/bitcoin/bitcoin/pull/12270) for an example. Reviewers can verify the results by running `getchaintxstats <window_block_count> <window_last_block_hash>` with the `window_block_count` and `window_last_block_hash` from your output.
30-
* In `configure.ac` and `build_msvc/bitcoin_config.h` on _the master branch_:
31-
- update `CLIENT_VERSION_MINOR` version
32-
* In `configure.ac` and `build_msvc/bitcoin_config.h` on _a new release branch_ (see [this commit](https://github.com/bitcoin/bitcoin/commit/742f7dd972fca3dd4a33cfff90bf901b71a687e7)):
33-
- update `CLIENT_VERSION_MINOR` version
30+
* On both the master branch and the new release branch:
31+
- update `CLIENT_VERSION_MINOR` in [`configure.ac`](../configure.ac)
32+
- update `CLIENT_VERSION_MINOR`, `PACKAGE_VERSION`, and `PACKAGE_STRING` in [`build_msvc/bitcoin_config.h`](/build_msvc/bitcoin_config.h)
33+
* On the new release branch in [`configure.ac`](../configure.ac) and [`build_msvc/bitcoin_config.h`](/build_msvc/bitcoin_config.h) (see [this commit](https://github.com/bitcoin/bitcoin/commit/742f7dd)):
3434
- set `CLIENT_VERSION_REVISION` to `0`
3535
- set `CLIENT_VERSION_IS_RELEASE` to `true`
3636

0 commit comments

Comments
 (0)