Add the new commit count and git hash to the version #2038
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
teor2345
added
A-rust
teor2345
changed the title
teor2345
commented
Apr 20, 2021
teor2345
commented
Apr 20, 2021
teor2345
commented
Apr 20, 2021
This helps diagnose bugs in versions of Zebra built from git branches, rather than git version tags.
teor2345
force-pushed
the
vergen-git-tag-count-hash
branch
from
79bd2fb to
c4b1860
Compare
teor2345
changed the title
dconnolly
reviewed
Apr 21, 2021
Comment on lines
+25
to
+29
| impl From<Network> for &'static str { | ||
| fn from(network: Network) -> &'static str { | ||
| (&network).into() | ||
| } | ||
| } |
dconnolly
reviewed
Apr 21, 2021
Comment on lines
+53
to
+54
| // strip the leading "v", if present | ||
| if &vergen_git_semver[0..1] == "v" { |
There was a problem hiding this comment.
lol, this is such a funny convention variance, depending on where published
dconnolly
reviewed
Apr 21, 2021
dconnolly
reviewed
Apr 21, 2021
Comment on lines
+223
to
+224
| ("branch", option_env!("VERGEN_GIT_BRANCH").map(Into::into)), | ||
| ("git commit", Self::git_commit().map(Into::into)), |
dconnolly
reviewed
Apr 21, 2021
| @@ -233,7 +289,7 @@ impl Application for ZebradApp { | |||
| let guard = sentry::init( | |||
| sentry::ClientOptions { | |||
| debug: true, | |||
| release: Self::git_commit().map(Into::into), | |||
| release: Some(app_version().to_string().into()), | |||
dconnolly
approved these changes
Apr 21, 2021
|
I want to squash this one to get rid of the tiny commits and buggy commits. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
When someone is running on a git branch, sometimes it's hard to tell which version they branched off.
Solution
Add the following info to the
versionin the panic, ticket template, and sentry report metadata:The code in this pull request has:
Manual Test Output
Cause a port/database conflict panic:
Review
This useful debugging feature can be reviewed by anyone at any time.
Related Issues
Adds commits to PR #2037
Follow Up Work
Use the target triple even if there is no
.gitdirectory, needs rustyhorde/vergen#64