diff options
| author | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-08-10 12:18:44 +0200 |
|---|---|---|
| committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-08-10 22:33:33 +0200 |
| commit | 4a693ff29e575de61bbef915201f76b7b69454c5 (patch) | |
| tree | 3c3653989041c6d8f892167f08fd25d452e9094a /src/rpc/system.rs | |
| parent | 8cd02639dc688dcb736b5c36dae822706862fac1 (diff) | |
| download | garage-4a693ff29e575de61bbef915201f76b7b69454c5.tar.gz garage-4a693ff29e575de61bbef915201f76b7b69454c5.zip | |
Configure structopt to report the right versionv0.7.2+ci-test-version
By default, structopt reports the value provided by
the env var CARGO_PKG_VERSION, feeded by Cargo when reading
Cargo.toml. However for Garage we use a versioning based on git,
so we often report a version that is behind the real version.
In this commit, we create garage_util::version::garage() that
reports the right version and configure all structopt subcommands
to call this function instead of using the env var.
Diffstat (limited to 'src/rpc/system.rs')
| -rw-r--r-- | src/rpc/system.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/rpc/system.rs b/src/rpc/system.rs index f9f2970b..fbfbbf56 100644 --- a/src/rpc/system.rs +++ b/src/rpc/system.rs @@ -27,6 +27,7 @@ use garage_util::data::*; use garage_util::error::*; use garage_util::persister::Persister; use garage_util::time::*; +use garage_util::version; use crate::consul::*; #[cfg(feature = "kubernetes-discovery")] @@ -320,11 +321,7 @@ impl System { // also available through RPC) ---- pub fn garage_version(&self) -> &'static str { - option_env!("GIT_VERSION").unwrap_or(git_version::git_version!( - prefix = "git:", - cargo_prefix = "cargo:", - fallback = "unknown" - )) + version::garage() } pub fn get_known_nodes(&self) -> Vec<KnownNodeInfo> { |