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

Change git info in genbuild.sh #402

Merged
merged 1 commit into from
Nov 24, 2017
Merged

Change git info in genbuild.sh #402

merged 1 commit into from
Nov 24, 2017

Conversation

jonspock
Copy link

This slightly changes the usage of git calls in genbuild.sh to get a better description of what is built during development / building. Rather than just always get 3.0.99-g8fa5f125e, you'll get something more descriptive such as '3.0.5.1-branchpoint-1-g8fa5f125e', where the '1' is the number of commits after the "3.0.5.1-branchpoint" tag. This also makes it easier to locate the commit in the git tree and compare to others who are using slightly different versions.
Since this is only using git calls from a shell script it should work on all of the same platforms as the current script.
As before, when we build from a tag for releases then you should simply get something like "v3.0.6" without the extra fields.
Finally I believe this tag/description just goes to the splash screen and for internal usage - not to other peers.
This is a simpler change than PR #310

@ghost ghost assigned jonspock Nov 20, 2017
@ghost ghost added the review label Nov 20, 2017
@Mrs-X
Copy link

Mrs-X commented Nov 24, 2017

utACK and merging...

@Mrs-X Mrs-X merged commit 8fa5f12 into PIVX-Project:master Nov 24, 2017
Mrs-X added a commit that referenced this pull request Nov 24, 2017
8fa5f12 Change git commands called so we can get a better description for non-release source builds (Jon Spock)

Tree-SHA512: fed718c2943fd43a35b41ddf2b00577d00d64fed292d7dd0cd9866587c61b4c0278a4bd2ddbe134e5ccc3f3841751e099dc0fef596834eaad310356f33ad0bbe
@ghost ghost removed the review label Nov 24, 2017
@Fuzzbawls Fuzzbawls added this to the 3.0.6 milestone Nov 25, 2017
Fuzzbawls pushed a commit to Fuzzbawls/PIVX that referenced this pull request Nov 29, 2017
meyer9 pushed a commit to phoreproject/Phore that referenced this pull request Feb 15, 2018
Fuzzbawls added a commit to Fuzzbawls/PIVX that referenced this pull request Mar 5, 2018
The previous change required tagging on `master`, which we don't do. As
a result, the version string displayed in-wallet was always displaying
based off of a dummy tag that was pushed during the review of PIVX-Project#402.

This PR restores the functionality to generate the version string
without relying on superficial tags.

This reverts commit 8fa5f12.
Mrs-X added a commit that referenced this pull request Mar 6, 2018
b5be194 Revert #402 "Change git info in genbuild.sh" (Fuzzbawls)

Tree-SHA512: dfd8e99be8457a1c6973e4dd4883dc8c1f34541e68a10fcc9d3600abebba008474c13aa5de00a556f51f4d83bdcd95942cd5a1eb6fd2b031a9cd12daba1458a8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants