Skip to content

backport: bitcoin#22685: clientversion: No suffix #if CLIENT_VERS… #4836

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.

Sign up for GitHub

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

Jump to bottom
Merged
UdjinM6 merged 1 commit into from
May 12, 2022
Merged

backport: bitcoin#22685: clientversion: No suffix #if CLIENT_VERS… #4836

UdjinM6 merged 1 commit into from
May 12, 2022

Conversation

@PastaPastaPasta
Copy link
Member

@PastaPastaPasta PastaPastaPasta commented May 11, 2022

No description provided.

@fanquake @PastaPastaPasta
Merge bitcoin#22685: clientversion: No suffix #if CLIENT_VERSION_IS_R…
8504c5a 
…ELEASE

5100dee clientversion: No suffix #if CLIENT_VERSION_IS_RELEASE (Carl Dong)

Pull request description:

  ```
  Previously, building from a release source tarball would result in a
  version string like v22.0.0-<commithash>, but we expect just v22.0.0.
  This commit solves this problem.

  Also use PACKAGE_VERSION instead of reconstructing it.
  ```

  Fixes the underlying problem of bitcoin#22623

ACKs for top commit:
  achow101:
    ACK 5100dee
  fanquake:
    ACK 5100dee - tested that prior the output of `src/bitcoind -version` on the `22.x` branch was `Bitcoin Core version v22.0.0-d3bd5410f64e`, and with this commit cherry-picked it is `Bitcoin Core version v22.0.0rc2`.

Tree-SHA512: 78705e285ff1271d5012e888837049044db4d11d66c252c6b964685892ef078c56fe122f12daa87c71532f4352f695d1e88a228665adcd7afe3ddce3f209b49f
@PastaPastaPasta PastaPastaPasta added this to the 18.1 milestone May 11, 2022
@PastaPastaPasta PastaPastaPasta requested a review from UdjinM6 May 11, 2022 16:07
UdjinM6
UdjinM6 approved these changes May 12, 2022
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 merged commit ebb5b5b into dashpay:develop May 12, 2022
@PastaPastaPasta PastaPastaPasta deleted the develop-trivial-2022-05-11 branch May 12, 2022 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

18.1

Development

Successfully merging this pull request may close these issues.

3 participants

@PastaPastaPasta @UdjinM6 @fanquake