fix: trin cli flag displays wrong version info #1615
Conversation
|
|
||
| use vergen::EmitBuilder; | ||
|
|
||
| fn main() -> Result<(), Box<dyn Error>> { |
There was a problem hiding this comment.
I think you're going to either have to set a GIT_HASH env var here, or update our 2 dockerfiles so that it'll pick up the env var here
There was a problem hiding this comment.
https://github.com/sigp/lighthouse/blob/stable/Dockerfile
https://github.com/paradigmxyz/reth/blob/main/Dockerfile
both Lighthouse and Reth copy the whole folder, if we do that it would resolve this issue and we could remove
Lines 8 to 11 in ddbd9ff
and passing the git hash in with the CI,
As only copying in the crates would be problematic for vergen
Reth uses this https://github.com/LukeMathWalker/cargo-chef?tab=readme-ov-file#benefits-of-cargo-chef package, which I think will resolve our caching problems we were trying to solve by copying crates individually, this should also make it so we have to update our crates less so the code is more maintainable.
There was a problem hiding this comment.
I will make a PR updating our dockerfiles with what I said above in mind
There was a problem hiding this comment.
Here is a PR which resolves your concern, once both of these PR's are merged it will work as expected
ethportal-api/src/version.rs
Outdated
| // /// The version of the programming language used to build the binary. | ||
| pub const PROGRAMMING_LANGUAGE_VERSION: &str = env!("VERGEN_RUSTC_SEMVER"); | ||
|
|
||
| pub const VERSION: &str = const_format::formatcp!( |
There was a problem hiding this comment.
nit:
| pub const VERSION: &str = const_format::formatcp!( | |
| pub const FULL_VERSION: &str = const_format::formatcp!( |
What was wrong?
This PR supercedes #1609 and fixes #995 and #1581 (comment) . #1609 seems more like a temporary patch to get things working, but I need this information for my
ping extensionsPR.I need to properly get the client version and such for my ping extensions PR so I am inclined to get fetching the version and commit properly. My PR fixes #995 which I need, #1609 seems more like a temporary fix due to
cargo publishbeing broken, which is respectable I would do the same, I decided to implement the full solution as I needed it for my other PRBasically when you build Trin it will report the wrong commit hash. And the shadow setup breaks publishing the
ethportal-apicrate.I fixed the problem by removing shadow and using
vergeninstead.I ran
cargo publish --dry-runand it ran successfully so publish works with this PRI also ran
cargo run -p trin -- --versionand it works
I get
trin v0.1.1-92334364 linux-x86_64 rustc1.81.0which is the commit of the build which is good that is what we want
How was it fixed?
using vergen