diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-05-23 15:52:48 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-05-23 15:53:24 -0400 |
| commit | fe47ae168b575006230da7f8a5b25b1a5f4a4dda (patch) | |
| tree | 043f60425331ac57aa6a5d59304129608682f233 | |
| parent | 65c4bbe629bbb6eb4347d35a12b0b1c90eeabce9 (diff) | |
| parent | 8afca323e371a7a191d874928046d6bf2fbbe072 (diff) | |
| download | bitcoin-fe47ae168b575006230da7f8a5b25b1a5f4a4dda.tar.xz | |
Merge #16080: build/doc: update bitcoin_config.h packages, release process
8afca323e3 doc: add bitcoin_config.h PACKAGE updates to release process (Jon Atack)
3ee28c506d 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 https://github.com/bitcoin/bitcoin/pull/16080/commits/8afca323e371a7a191d874928046d6bf2fbbe072
Tree-SHA512: be4308636846d719d2406790b33861a5ca4775cec77b7b40f2a01e0180d55e36d821b680c923c366de6ddb576f8a94efe59bf66a5f0637cbc2ecff6c824fe602
| -rw-r--r-- | build_msvc/bitcoin_config.h | 4 | ||||
| -rw-r--r-- | doc/release-process.md | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build_msvc/bitcoin_config.h b/build_msvc/bitcoin_config.h index b5a05e2629..ab13f73539 100644 --- a/build_msvc/bitcoin_config.h +++ b/build_msvc/bitcoin_config.h @@ -346,7 +346,7 @@ #define PACKAGE_NAME "Bitcoin Core" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Bitcoin Core 0.17.99" +#define PACKAGE_STRING "Bitcoin Core 0.18.99" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "bitcoin" @@ -355,7 +355,7 @@ #define PACKAGE_URL "https://bitcoincore.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.17.99" +#define PACKAGE_VERSION "0.18.99" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ diff --git a/doc/release-process.md b/doc/release-process.md index 9b796fa816..e9c6d5bf0d 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -27,10 +27,10 @@ Release Process * Update [`src/chainparams.cpp`](/src/chainparams.cpp) m_assumed_blockchain_size and m_assumed_chain_state_size with the current size plus some overhead. * Update `src/chainparams.cpp` chainTxData with statistics about the transaction count and rate. Use the output of the RPC `getchaintxstats`, see [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. -* In `configure.ac` and `build_msvc/bitcoin_config.h` on _the master branch_: - - update `CLIENT_VERSION_MINOR` version -* In `configure.ac` and `build_msvc/bitcoin_config.h` on _a new release branch_ (see [this commit](https://github.com/bitcoin/bitcoin/commit/742f7dd972fca3dd4a33cfff90bf901b71a687e7)): - - update `CLIENT_VERSION_MINOR` version +* On both the master branch and the new release branch: + - update `CLIENT_VERSION_MINOR` in [`configure.ac`](../configure.ac) + - update `CLIENT_VERSION_MINOR`, `PACKAGE_VERSION`, and `PACKAGE_STRING` in [`build_msvc/bitcoin_config.h`](/build_msvc/bitcoin_config.h) +* 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)): - set `CLIENT_VERSION_REVISION` to `0` - set `CLIENT_VERSION_IS_RELEASE` to `true` |