Skip to content

Commit

Permalink
Expose version info in CLI tool with build-time obtained git hash (pa…
Browse files Browse the repository at this point in the history
…ritytech#787)

* version info with built-time obtained git hash

* clippy

* rerun-if-changed properly and handle git command failing

* cargo fmt
  • Loading branch information
jsdw committed Jan 17, 2023
1 parent c9f414f commit 08d6640
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ subxt-codegen = { version = "0.25.0", path = "../codegen" }
# perform node compatibility
subxt-metadata = { version = "0.25.0", path = "../metadata" }
# parse command line args
clap = { version = "4.0.8", features = ["derive"] }
clap = { version = "4.0.8", features = ["derive", "cargo"] }
# colourful error reports
color-eyre = "0.6.1"
# serialize the metadata
Expand Down
35 changes: 35 additions & 0 deletions cli/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
use std::{
borrow::Cow,
process::Command,
};

fn main() {
// Make git hash available via GIT_HASH build-time env var:
output_git_short_hash();
}

fn output_git_short_hash() {
let output = Command::new("git")
.args(["rev-parse", "--short=11", "HEAD"])
.output();

let git_hash = match output {
Ok(o) if o.status.success() => {
let sha = String::from_utf8_lossy(&o.stdout).trim().to_owned();
Cow::from(sha)
}
Ok(o) => {
println!("cargo:warning=Git command failed with status: {}", o.status);
Cow::from("unknown")
}
Err(err) => {
println!("cargo:warning=Failed to execute git command: {}", err);
Cow::from("unknown")
}
};

println!("cargo:rustc-env=GIT_HASH={}", git_hash);
println!("cargo:rerun-if-changed=../.git/HEAD");
println!("cargo:rerun-if-changed=../.git/refs");
println!("cargo:rerun-if-changed=build.rs");
}
1 change: 1 addition & 0 deletions cli/src/commands/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
pub mod codegen;
pub mod compatibility;
pub mod metadata;
pub mod version;
16 changes: 16 additions & 0 deletions cli/src/commands/version.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
use clap::Parser as ClapParser;

/// Prints version information
#[derive(Debug, ClapParser)]
pub struct Opts {}

pub fn run(_opts: Opts) -> color_eyre::Result<()> {
let git_hash = env!("GIT_HASH");
println!(
"{} {}-{}",
clap::crate_name!(),
clap::crate_version!(),
git_hash
);
Ok(())
}
2 changes: 2 additions & 0 deletions cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ enum Command {
Metadata(commands::metadata::Opts),
Codegen(commands::codegen::Opts),
Compatibility(commands::compatibility::Opts),
Version(commands::version::Opts),
}

#[tokio::main]
Expand All @@ -24,5 +25,6 @@ async fn main() -> color_eyre::Result<()> {
Command::Metadata(opts) => commands::metadata::run(opts).await,
Command::Codegen(opts) => commands::codegen::run(opts).await,
Command::Compatibility(opts) => commands::compatibility::run(opts).await,
Command::Version(opts) => commands::version::run(opts),
}
}

0 comments on commit 08d6640

Please sign in to comment.