This repository has been archived by the owner on Jan 14, 2023. It is now read-only.
add git commit hash to version #116
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
as discussed on matrix this may be helpful for user bug reports I could not find a way to format the string at compile time in which case I could have used something like: `#[structopt(version = git_version::git_version!() + ... )]` output: $ cargo run - --version cargo-embed 0.9.1 git commit: baca8ba
Yatekii
reviewed
Nov 1, 2020
| @@ -28,8 +28,14 @@ use probe_rs::{ | |||
| use probe_rs_cli_util::build_artifact; | |||
| use probe_rs_rtt::{Rtt, ScanRegion}; | |||
|
|
|||
| const CARGO_NAME: &'static str = env!("CARGO_PKG_NAME"); | |||
There was a problem hiding this comment.
Why not add those constants to the cli-util lib? :) I think that should work and then we can also add this to cargo-flash? :)
There was a problem hiding this comment.
does not seem to work for git_version
$ git status
On branch version
nothing to commit, working tree clean
$ git rev-parse --short HEAD
e0104b6
$ cargo run - --version
probe-rs-cli-util 0.9.0
git commit: v0.5.1-467-g7b33b4b-modified
I don't even see where 0.5.1 comes from :/ but both cargo env variable and git_version do the wrong thing or maybe phrased more accurately are used in a way they were not meant to be ;)
We can still add it to cargo flash as well though, just copy pasting :D
There was a problem hiding this comment.
Yeah sounds good to me :) Do this now, possibly improve later :)
|
Build succeeded: |
benmkw
added a commit
to benmkw/cargo-flash
that referenced
this pull request
Jan 10, 2021
same as probe-rs/cargo-embed#116 output: cargo-flash 0.10.2 git commit: db4e2c3
bors bot
added a commit
to probe-rs/cargo-flash
that referenced
this pull request
Jan 10, 2021
155: add git commit hash to version r=Yatekii a=benmkw same as probe-rs/cargo-embed#116 output: ``` cargo-flash 0.10.2 git commit: db4e2c3 ``` I scrolled though matrix and saw this was still needed :) (this was not put into probe-rs-cli-util because it would then use the wrong commit hash iirc) Co-authored-by: Benedikt Mandelkow <[email protected]>
Yatekii
pushed a commit
to probe-rs/probe-rs
that referenced
this pull request
Jan 13, 2023
same as probe-rs/cargo-embed#116 output: cargo-flash 0.10.2 git commit: db4e2c3
Yatekii
pushed a commit
to probe-rs/probe-rs
that referenced
this pull request
Jan 13, 2023
155: add git commit hash to version r=Yatekii a=benmkw same as probe-rs/cargo-embed#116 output: ``` cargo-flash 0.10.2 git commit: db4e2c3 ``` I scrolled though matrix and saw this was still needed :) (this was not put into probe-rs-cli-util because it would then use the wrong commit hash iirc) Co-authored-by: Benedikt Mandelkow <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
as discussed on matrix this may be helpful for user bug reports
I could not find a way to format the string at compile time in which
case I could have used something like:
#[structopt(version = git_version::git_version!() + .... )]output:
If you want to do the cargo update stuff separately I can also adjust after thats done.
Tested on macos only.