Add commit hash to version info, if present #957
Conversation
helix-term/src/main.rs
Outdated
| @@ -66,7 +66,7 @@ FLAGS: | |||
| -V, --version Prints version information | |||
| ", | |||
| env!("CARGO_PKG_NAME"), | |||
| env!("CARGO_PKG_VERSION"), | |||
| env!("GIT_HASH"), | |||
There was a problem hiding this comment.
I'd rather see us use version-hash in both places, i.e. v0.4.0-abcdef
helix-term/build.rs
Outdated
| .map(|x| String::from_utf8(x.stdout).ok()) | ||
| .ok() | ||
| .flatten() | ||
| .unwrap_or(String::from(env!("CARGO_PKG_VERSION"))); |
There was a problem hiding this comment.
| .map(|x| String::from_utf8(x.stdout).ok()) | |
| .ok() | |
| .flatten() | |
| .unwrap_or(String::from(env!("CARGO_PKG_VERSION"))); | |
| .and_then(|output| String::from_utf8((output.stdout)) | |
| .unwrap_or_default(); |
| use std::process::Command; | ||
| fn main() { | ||
| let git_hash = Command::new("git") | ||
| .args(&["describe", "--dirty"]) |
There was a problem hiding this comment.
I think we also want to use "rev-parse", "--short", "HEAD" so we only get the SHA
There was a problem hiding this comment.
Oh, I thought @pickfire 's comment here:
made sense. It seems like dirty-ness and distance from release could be really useful info. Is there a constraint somewhere else that makes such a string difficult to work with?
There was a problem hiding this comment.
I had that for my first draft, and then changed to describe --dirty after reading @pickfire's comment on the issue. Would be no problem to switch back, if we're not concerned about version including knowledge of dirty state.
There was a problem hiding this comment.
I guess it's okay, but describe always uses the latest available tag. We'll have to be careful because if the code is built after a new tag is accidentally added then the version info will be wrong.
There was a problem hiding this comment.
Would it be worthwhile to use a specific process/tool to enforce that the version can't use any tag except the actual release tag?
There was a problem hiding this comment.
So this actually happened in the latest release (it builds as v0.5 on latest master because the release points to a commit before I rebased against master). I'd still rather see we only pull the SHA and use the crate version.
Co-authored-by: Ivan Tham <pickfire@riseup.net>
Fixes #922. Right now it doesn't detect release versions, and just blindly throws on the commit hash in all cases that one exists. Reverts to old (current) behavior if built in an environment with no git repo.