Move major version to first version integer as specified by SemVer #20251

pull luke-jr wants to merge 1 commits into bitcoin:master from luke-jr:semver2 changing 3 files +11 −11

luke-jr commented at 11:46 PM on October 26, 2020: member

Second version integer CAN BE ~~becomes~~ reserved for consensus change releases, now separate from bugfix-only revisions

Edit: Or anything else, I guess. This PR simply rearranges the version number.

Clean SemVer-compatible alternative to #20223

Move major version to first version integer as specified by SemVer

Second version integer becomes reserved for consensus change releases, now separate from bugfix-only revisions

22137ccdc3

luke-jr commented at 11:47 PM on October 26, 2020: member

Not only should this reduce confusion, it can also make it even clearer when a new softfork is included in a release.
DrahtBot added the label Build system on Oct 27, 2020
DrahtBot added the label Docs on Oct 27, 2020
DrahtBot commented at 5:29 AM on October 27, 2020: member


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #20223 (Drop the leading 0 from the version number by achow101)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
MarcoFalke removed the label Docs on Oct 27, 2020
MarcoFalke added this to the milestone 22.0 on Oct 27, 2020
MarcoFalke added the label Needs gitian build on Oct 29, 2020
MarcoFalke added the label Needs Guix build on Oct 29, 2020

DrahtBot commented at 10:01 AM on October 30, 2020: member

Guix builds

File	commit 42b66a6b814bca130a9ccf0a3f747cf33d628232<br>(master)	commit d45bb822e9f8b1cfa199525c3a6d2f535e7c5fa2<br>(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`577f73bcd300b470...`	`ac30067b0d7d9348...`
*-aarch64-linux-gnu.tar.gz	`43d20a368737a94a...`	`e19f904a38111b8d...`
*-arm-linux-gnueabihf-debug.tar.gz	`56291188f11b5c42...`	`7b7958d0711969be...`
*-arm-linux-gnueabihf.tar.gz	`e4f679025d5a245a...`	`0e7ca004f04b3aba...`
*-riscv64-linux-gnu-debug.tar.gz	`5c5ce10a9f20b3df...`	`2359209f48e98c52...`
*-riscv64-linux-gnu.tar.gz	`3829813dbd3aa0a7...`	`6ba4d610fc9a6ac8...`
*-win-unsigned.tar.gz	`709cc9fff45aa451...`	`3c3ea64ef8cbea05...`
*-win64-debug.zip	`5eff5808d1e0cb17...`	`f3f75e65d20a0d6d...`
*-win64-setup-unsigned.exe	`df2959c27db37f53...`	`d4aba87a23fd8d25...`
*-win64.zip	`74fbbd3e20382061...`	`5f7a660e5fea9130...`
*-x86_64-linux-gnu-debug.tar.gz	`7f15ae564001deb1...`	`378d79f1b7ed5f5c...`
*-x86_64-linux-gnu.tar.gz	`dc6e32a6074c479e...`	`e1e508dc5e241022...`
*.tar.gz	`77997b9b26eef495...`	`bd65c05451512cae...`
guix_build.log	`d10fabcf15c86521...`	`5c4aed02fac32a8c...`
guix_build.log.diff		`cbc193152b83c161...`

DrahtBot removed the label Needs Guix build on Oct 30, 2020

DrahtBot commented at 4:59 AM on October 31, 2020: member

Gitian builds

File	commit 42b66a6b814bca130a9ccf0a3f747cf33d628232<br>(master)	commit d45bb822e9f8b1cfa199525c3a6d2f535e7c5fa2<br>(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz	`37dab2036b3fd5f3...`	`50c8636467bb7c04...`
*-aarch64-linux-gnu.tar.gz	`c3ef2f10a79331f8...`	`095178c39654c997...`
*-arm-linux-gnueabihf-debug.tar.gz	`ed6570eefa68d1d1...`	`aa94ff6e859a5777...`
*-arm-linux-gnueabihf.tar.gz	`2c3a9964380dabae...`	`6ff12e36a345f742...`
*-osx-unsigned.dmg	`73ee49c87e7e4213...`	`6475350ab6987aa9...`
*-osx64.tar.gz	`67bc5339327110d1...`	`8f0754da215a38ac...`
*-riscv64-linux-gnu-debug.tar.gz	`be052bec6fb124f8...`	`e07095deea21439b...`
*-riscv64-linux-gnu.tar.gz	`b3cb4c0722d2c47b...`	`26d7315c39655eef...`
*-win64-debug.zip	`caff5fe973c276d9...`	`1938770f0562b54b...`
*-win64-setup-unsigned.exe	`4772924a13a034f7...`	`8584aa3c6247c1b9...`
*-win64.zip	`05476b6e870708a7...`	`bbbe4f6c625f20c4...`
*-x86_64-linux-gnu-debug.tar.gz	`0622b402f5ef5a93...`	`d1aefa026351bbdf...`
*-x86_64-linux-gnu.tar.gz	`f1a13b023b38f1f4...`	`126c0f893d6016a1...`
*.tar.gz	`77997b9b26eef495...`	`bd65c05451512cae...`
bitcoin-core-linux-0.21-res.yml	`a80b4c6b2ea8bb50...`	`5a4558870ec03c01...`
bitcoin-core-osx-0.21-res.yml	`319a7d98ff63a582...`	`e794bdde2ec0acf6...`
bitcoin-core-win-0.21-res.yml	`e6281728ac57e7ef...`	`530da1200d0436d3...`
linux-build.log	`beb524d3a15073eb...`	`42d31a3726f6b8f9...`
osx-build.log	`8e5aa58863d8d0ca...`	`f3ff326fa8651af4...`
win-build.log	`524b2c1c8a825a3c...`	`93c6d5d0be6772d3...`
bitcoin-core-linux-0.21-res.yml.diff		`88f4a84b2939a4fd...`
bitcoin-core-osx-0.21-res.yml.diff		`aa619be8a8366d33...`
bitcoin-core-win-0.21-res.yml.diff		`cf70708401008580...`
linux-build.log.diff		`48ae4c19691aaddd...`
osx-build.log.diff		`f116d3033c538664...`
win-build.log.diff		`4dcd6357415d4722...`

DrahtBot removed the label Needs gitian build on Oct 31, 2020
DrahtBot commented at 10:59 AM on November 18, 2020: member



🐙 This pull request conflicts with the target branch and needs rebase.

<sub>Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".</sub>
DrahtBot added the label Needs rebase on Nov 18, 2020
fanquake commented at 2:58 AM on November 21, 2020: member

Given #20223 has now been merged, and had a significant number of Concept ACKs, I'm not sure we need to keep an alternative open any longer.
fanquake closed this on Nov 21, 2020
luke-jr commented at 3:17 AM on November 21, 2020: member

This is the same Concept, but without the implementation flaws in the other PR...
DrahtBot locked this on Feb 15, 2022