Skip to content

Commit

Permalink
Merge bitcoin#15908: docs: Align MSVC build options with Linux build …
Browse files Browse the repository at this point in the history
…ones

e47dc4f Include bitcoin_config.h in release process (Hennadii Stepanov)
48ed65b Align MSVC build options with Linux build ones (Hennadii Stepanov)

Pull request description:

  Ref:
  - bitcoin#11526
  - bitcoin#15903 (comment)
  - bitcoin#15903 (comment) by MarcoFalke

ACKs for commit e47dc4:
  MarcoFalke:
    utACK e47dc4f
  Sjors:
    utACK e47dc4f
  fanquake:
    utACK e47dc4f
  practicalswift:
    utACK e47dc4f

Tree-SHA512: 32ac3e9fd0b41a4916dd520bdf8bb6c71cea7218434b67a173b51b3cdb0da3f10a68b9e5205c27a52f456ac9ed14f8f8363a50d108a80a5dd55b085a6bd435b9

# Conflicts:
#	build_msvc/bitcoin_config.h
#	doc/release-process.md
  • Loading branch information
MarcoFalke authored and Munkybooty committed Oct 7, 2021
1 parent 28a5e59 commit a6b968a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions doc/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ Release Process
* Update translations, see [translation_process.md](https://github.com/dashpay/dash/blob/master/doc/translation_process.md#synchronising-translations).

* Update manpages, see [gen-manpages.sh](https://github.com/dashpay/dash/blob/master/contrib/devtools/README.md#gen-manpagessh).
* Update release candidate version in `configure.ac` (`CLIENT_VERSION_RC`)
* Update release candidate version in `configure.ac` (`CLIENT_VERSION_RC`).

Before every minor and major release:

* Update [bips.md](bips.md) to account for changes since the last release.
* Update version in `configure.ac` (don't forget to set `CLIENT_VERSION_IS_RELEASE` to `true`) (don't forget to set `CLIENT_VERSION_RC` to `0`)
* Write release notes (see below)
* Update version in `configure.ac` (don't forget to set `CLIENT_VERSION_RC` to `0`).
* Write release notes (see below).
* Update `src/chainparams.cpp` nMinimumChainWork with information from the getblockchaininfo rpc.
* Update `src/chainparams.cpp` defaultAssumeValid with information from the getblockhash rpc.
- The selected value must not be orphaned so it may be useful to set the value two blocks back from the tip.
Expand Down

0 comments on commit a6b968a

Please sign in to comment.