Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include full version number in released file names #14612

Merged
merged 3 commits into from Nov 23, 2018

Conversation

@achow101
Copy link
Member

@achow101 achow101 commented Oct 30, 2018

As noted on IRC, the filenames of the gitian build results do not contain the 4th digit of the version number if it has one, e.g. 0.17.0.1 produces files with the number 0.17.0. Furthermore, when RC's are built, the resulting filenames are of the release version and do not include rc in them. This occurs because configure.ac is written to create version numbers of the form major.minor.rev instead of major.minor.rev.build and without any rc version as it does not handle rc numbers.

This PR changes configure.ac to include the build number if it is greater than 0. It will also include the rc number if it is greater than 0. So the filenames of the gitian builds will now contain the full version number.

This behavior can be tested by setting _CLIENT_VERSION_BUILD and _CLIENT_VERSION_RC to non-zero values and then doing make dist. A tar file should be created with the correct versioning.

achow101 added 2 commits Oct 30, 2018
When the build number (CLIENT_VERSION_BUILD) is non-zero, we want
to include that in the package version number so the resulting binaries
are named with the correct version.
@luke-jr
Copy link
Member

@luke-jr luke-jr commented Oct 30, 2018

So it would show 0.17.0.1rc1 if that was the version?

Might be nice to actually use the full version number generated from the tag, so non-tag builds get the commit hash in there...

@achow101
Copy link
Member Author

@achow101 achow101 commented Oct 31, 2018

So it would show 0.17.0.1rc1 if that was the version?

It would only show in the gitian produced files. This shouldn't effect what users would see from -version or in the About window.

@laanwj
Copy link
Member

@laanwj laanwj commented Oct 31, 2018

Concept ACK

  • maybe not for this PR, but would also make sense to show the RC information in the about: dialog and the log
  • probably needs an update to doc/release-process.md to update this new setting between rcs
  • this naming might need updates at the side of bitcoin.org (@wbnns) and bitcoincore.org (@harding) though as RCs are never linked from the webpage, and .dot releases are extremely are, that might amount to nothing or at least not be urgent. Normal releases will not change name, correct?

@harding
Copy link
Member

@harding harding commented Oct 31, 2018

For BitcoinCore.org, as @laanwj mentions, the regular content part of the website doesn't currently have any pages that link directly to RCs, so no changes are necessary as long as the final release files continue to use the same naming scheme.

@laanwj laanwj added this to the 0.18.0 milestone Nov 1, 2018
@wbnns
Copy link

@wbnns wbnns commented Nov 1, 2018

Should be okay for bitcoin.org as well, thanks.

@achow101
Copy link
Member Author

@achow101 achow101 commented Nov 1, 2018

I've updated release-process.md to say that CLIENT_VERSION_RC needs to be updated before each RC.

Normal releases will not change name, correct?

Correct.

@laanwj
Copy link
Member

@laanwj laanwj commented Nov 1, 2018

@harding @wbnns thanks for weighing in

utACK 75a4bf6

@laanwj
Copy link
Member

@laanwj laanwj commented Nov 5, 2018

@theuni I suppose you're ok with this?

@laanwj laanwj merged commit 75a4bf6 into bitcoin:master Nov 23, 2018
2 checks passed
laanwj added a commit that referenced this issue Nov 23, 2018
75a4bf6 Update release-process.md to include RC version bumping (Andrew Chow)
04b0bc7 build: include rc number in version number (Andrew Chow)
895e6bb build: if VERSION_BUILD is non-zero, include it in the package version (Andrew Chow)

Pull request description:

  As noted on IRC, the filenames of the gitian build results do not contain the 4th digit of the version number if it has one, e.g. 0.17.0.1 produces files with the number 0.17.0. Furthermore, when RC's are built, the resulting filenames are of the release version and do not include `rc` in them. This occurs because `configure.ac` is written to create version numbers of the form `major.minor.rev` instead of `major.minor.rev.build` and without any rc version as it does not handle rc numbers.

  This PR changes `configure.ac` to include the build number if it is greater than 0. It will also include the rc number if it is greater than 0. So the filenames of the gitian builds will now contain the full version number.

  This behavior can be tested by setting `_CLIENT_VERSION_BUILD` and `_CLIENT_VERSION_RC` to non-zero values and then doing `make dist`. A tar file should be created with the correct versioning.

Tree-SHA512: b77990485f2c7770be897dc136737cd805306afff9882ebef7170741f363203587356ccf8bec83163268ace1bd77433fbd2ba8c213f993677bfb867d99a0bbe7
@bitcoin bitcoin deleted a comment from DrahtBot Nov 23, 2018
random-zebra added a commit to PIVX-Project/PIVX that referenced this issue Nov 25, 2019
298528c build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)
04f5d5b build: use full version string in setup.exe (MarcoFalke)
c787618 Update release-process.md to include RC version bumping (Andrew Chow)
32a69da build: include rc number in version number (Andrew Chow)
8c2b28b build: if VERSION_BUILD is non-zero, include it in the package version (Andrew Chow)

Pull request description:

  This is a backport of the following 3 upstream PRs that result in more precise file names in gitian outputs and in macOS app version info; namely that they are no longer limited to only 3 levels deep (`3.4.0` for example) and will now include the 4th level and/or the RC version if needed (`4.0.0rc1` or `4.0.0.1` for example).

  bitcoin#14612
  bitcoin#14701
  bitcoin#15548

Top commit has no ACKs.

Tree-SHA512: 1195e9c0af92f4d6c2f7546530d1d5c1046f9139c8f9a03d2d8e092bbbcf5e5c5d046523e8a3712bde3d84bf81252dcc8dbb1ac3f1cdaaa863b1d14c3251fe95
TheHolyRoger added a commit to TheHolyRogerCoin/TheHolyRogerCoin that referenced this issue Jul 26, 2020
Munkybooty added a commit to Munkybooty/dash that referenced this issue Jul 29, 2021
75a4bf6 Update release-process.md to include RC version bumping (Andrew Chow)
04b0bc7 build: include rc number in version number (Andrew Chow)
895e6bb build: if VERSION_BUILD is non-zero, include it in the package version (Andrew Chow)

Pull request description:

  As noted on IRC, the filenames of the gitian build results do not contain the 4th digit of the version number if it has one, e.g. 0.17.0.1 produces files with the number 0.17.0. Furthermore, when RC's are built, the resulting filenames are of the release version and do not include `rc` in them. This occurs because `configure.ac` is written to create version numbers of the form `major.minor.rev` instead of `major.minor.rev.build` and without any rc version as it does not handle rc numbers.

  This PR changes `configure.ac` to include the build number if it is greater than 0. It will also include the rc number if it is greater than 0. So the filenames of the gitian builds will now contain the full version number.

  This behavior can be tested by setting `_CLIENT_VERSION_BUILD` and `_CLIENT_VERSION_RC` to non-zero values and then doing `make dist`. A tar file should be created with the correct versioning.

Tree-SHA512: b77990485f2c7770be897dc136737cd805306afff9882ebef7170741f363203587356ccf8bec83163268ace1bd77433fbd2ba8c213f993677bfb867d99a0bbe7
Munkybooty added a commit to Munkybooty/dash that referenced this issue Jul 29, 2021
75a4bf6 Update release-process.md to include RC version bumping (Andrew Chow)
04b0bc7 build: include rc number in version number (Andrew Chow)
895e6bb build: if VERSION_BUILD is non-zero, include it in the package version (Andrew Chow)

Pull request description:

  As noted on IRC, the filenames of the gitian build results do not contain the 4th digit of the version number if it has one, e.g. 0.17.0.1 produces files with the number 0.17.0. Furthermore, when RC's are built, the resulting filenames are of the release version and do not include `rc` in them. This occurs because `configure.ac` is written to create version numbers of the form `major.minor.rev` instead of `major.minor.rev.build` and without any rc version as it does not handle rc numbers.

  This PR changes `configure.ac` to include the build number if it is greater than 0. It will also include the rc number if it is greater than 0. So the filenames of the gitian builds will now contain the full version number.

  This behavior can be tested by setting `_CLIENT_VERSION_BUILD` and `_CLIENT_VERSION_RC` to non-zero values and then doing `make dist`. A tar file should be created with the correct versioning.

Tree-SHA512: b77990485f2c7770be897dc136737cd805306afff9882ebef7170741f363203587356ccf8bec83163268ace1bd77433fbd2ba8c213f993677bfb867d99a0bbe7
Munkybooty added a commit to Munkybooty/dash that referenced this issue Aug 3, 2021
75a4bf6 Update release-process.md to include RC version bumping (Andrew Chow)
04b0bc7 build: include rc number in version number (Andrew Chow)
895e6bb build: if VERSION_BUILD is non-zero, include it in the package version (Andrew Chow)

Pull request description:

  As noted on IRC, the filenames of the gitian build results do not contain the 4th digit of the version number if it has one, e.g. 0.17.0.1 produces files with the number 0.17.0. Furthermore, when RC's are built, the resulting filenames are of the release version and do not include `rc` in them. This occurs because `configure.ac` is written to create version numbers of the form `major.minor.rev` instead of `major.minor.rev.build` and without any rc version as it does not handle rc numbers.

  This PR changes `configure.ac` to include the build number if it is greater than 0. It will also include the rc number if it is greater than 0. So the filenames of the gitian builds will now contain the full version number.

  This behavior can be tested by setting `_CLIENT_VERSION_BUILD` and `_CLIENT_VERSION_RC` to non-zero values and then doing `make dist`. A tar file should be created with the correct versioning.

Tree-SHA512: b77990485f2c7770be897dc136737cd805306afff9882ebef7170741f363203587356ccf8bec83163268ace1bd77433fbd2ba8c213f993677bfb867d99a0bbe7
Munkybooty added a commit to Munkybooty/dash that referenced this issue Aug 5, 2021
75a4bf6 Update release-process.md to include RC version bumping (Andrew Chow)
04b0bc7 build: include rc number in version number (Andrew Chow)
895e6bb build: if VERSION_BUILD is non-zero, include it in the package version (Andrew Chow)

Pull request description:

  As noted on IRC, the filenames of the gitian build results do not contain the 4th digit of the version number if it has one, e.g. 0.17.0.1 produces files with the number 0.17.0. Furthermore, when RC's are built, the resulting filenames are of the release version and do not include `rc` in them. This occurs because `configure.ac` is written to create version numbers of the form `major.minor.rev` instead of `major.minor.rev.build` and without any rc version as it does not handle rc numbers.

  This PR changes `configure.ac` to include the build number if it is greater than 0. It will also include the rc number if it is greater than 0. So the filenames of the gitian builds will now contain the full version number.

  This behavior can be tested by setting `_CLIENT_VERSION_BUILD` and `_CLIENT_VERSION_RC` to non-zero values and then doing `make dist`. A tar file should be created with the correct versioning.

Tree-SHA512: b77990485f2c7770be897dc136737cd805306afff9882ebef7170741f363203587356ccf8bec83163268ace1bd77433fbd2ba8c213f993677bfb867d99a0bbe7
Munkybooty added a commit to Munkybooty/dash that referenced this issue Aug 8, 2021
75a4bf6 Update release-process.md to include RC version bumping (Andrew Chow)
04b0bc7 build: include rc number in version number (Andrew Chow)
895e6bb build: if VERSION_BUILD is non-zero, include it in the package version (Andrew Chow)

Pull request description:

  As noted on IRC, the filenames of the gitian build results do not contain the 4th digit of the version number if it has one, e.g. 0.17.0.1 produces files with the number 0.17.0. Furthermore, when RC's are built, the resulting filenames are of the release version and do not include `rc` in them. This occurs because `configure.ac` is written to create version numbers of the form `major.minor.rev` instead of `major.minor.rev.build` and without any rc version as it does not handle rc numbers.

  This PR changes `configure.ac` to include the build number if it is greater than 0. It will also include the rc number if it is greater than 0. So the filenames of the gitian builds will now contain the full version number.

  This behavior can be tested by setting `_CLIENT_VERSION_BUILD` and `_CLIENT_VERSION_RC` to non-zero values and then doing `make dist`. A tar file should be created with the correct versioning.

Tree-SHA512: b77990485f2c7770be897dc136737cd805306afff9882ebef7170741f363203587356ccf8bec83163268ace1bd77433fbd2ba8c213f993677bfb867d99a0bbe7
Munkybooty added a commit to Munkybooty/dash that referenced this issue Aug 9, 2021
75a4bf6 Update release-process.md to include RC version bumping (Andrew Chow)
04b0bc7 build: include rc number in version number (Andrew Chow)
895e6bb build: if VERSION_BUILD is non-zero, include it in the package version (Andrew Chow)

Pull request description:

  As noted on IRC, the filenames of the gitian build results do not contain the 4th digit of the version number if it has one, e.g. 0.17.0.1 produces files with the number 0.17.0. Furthermore, when RC's are built, the resulting filenames are of the release version and do not include `rc` in them. This occurs because `configure.ac` is written to create version numbers of the form `major.minor.rev` instead of `major.minor.rev.build` and without any rc version as it does not handle rc numbers.

  This PR changes `configure.ac` to include the build number if it is greater than 0. It will also include the rc number if it is greater than 0. So the filenames of the gitian builds will now contain the full version number.

  This behavior can be tested by setting `_CLIENT_VERSION_BUILD` and `_CLIENT_VERSION_RC` to non-zero values and then doing `make dist`. A tar file should be created with the correct versioning.

Tree-SHA512: b77990485f2c7770be897dc136737cd805306afff9882ebef7170741f363203587356ccf8bec83163268ace1bd77433fbd2ba8c213f993677bfb867d99a0bbe7
Munkybooty added a commit to Munkybooty/dash that referenced this issue Aug 11, 2021
75a4bf6 Update release-process.md to include RC version bumping (Andrew Chow)
04b0bc7 build: include rc number in version number (Andrew Chow)
895e6bb build: if VERSION_BUILD is non-zero, include it in the package version (Andrew Chow)

Pull request description:

  As noted on IRC, the filenames of the gitian build results do not contain the 4th digit of the version number if it has one, e.g. 0.17.0.1 produces files with the number 0.17.0. Furthermore, when RC's are built, the resulting filenames are of the release version and do not include `rc` in them. This occurs because `configure.ac` is written to create version numbers of the form `major.minor.rev` instead of `major.minor.rev.build` and without any rc version as it does not handle rc numbers.

  This PR changes `configure.ac` to include the build number if it is greater than 0. It will also include the rc number if it is greater than 0. So the filenames of the gitian builds will now contain the full version number.

  This behavior can be tested by setting `_CLIENT_VERSION_BUILD` and `_CLIENT_VERSION_RC` to non-zero values and then doing `make dist`. A tar file should be created with the correct versioning.

Tree-SHA512: b77990485f2c7770be897dc136737cd805306afff9882ebef7170741f363203587356ccf8bec83163268ace1bd77433fbd2ba8c213f993677bfb867d99a0bbe7
5tefan added a commit to 5tefan/dash that referenced this issue Aug 12, 2021
75a4bf6 Update release-process.md to include RC version bumping (Andrew Chow)
04b0bc7 build: include rc number in version number (Andrew Chow)
895e6bb build: if VERSION_BUILD is non-zero, include it in the package version (Andrew Chow)

Pull request description:

  As noted on IRC, the filenames of the gitian build results do not contain the 4th digit of the version number if it has one, e.g. 0.17.0.1 produces files with the number 0.17.0. Furthermore, when RC's are built, the resulting filenames are of the release version and do not include `rc` in them. This occurs because `configure.ac` is written to create version numbers of the form `major.minor.rev` instead of `major.minor.rev.build` and without any rc version as it does not handle rc numbers.

  This PR changes `configure.ac` to include the build number if it is greater than 0. It will also include the rc number if it is greater than 0. So the filenames of the gitian builds will now contain the full version number.

  This behavior can be tested by setting `_CLIENT_VERSION_BUILD` and `_CLIENT_VERSION_RC` to non-zero values and then doing `make dist`. A tar file should be created with the correct versioning.

Tree-SHA512: b77990485f2c7770be897dc136737cd805306afff9882ebef7170741f363203587356ccf8bec83163268ace1bd77433fbd2ba8c213f993677bfb867d99a0bbe7
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants