From 08d6640a6cffb12f2b756fb438165f8093887932 Mon Sep 17 00:00:00 2001 From: James Wilson Date: Tue, 17 Jan 2023 17:29:12 +0000 Subject: [PATCH] Expose version info in CLI tool with build-time obtained git hash (#787) * version info with built-time obtained git hash * clippy * rerun-if-changed properly and handle git command failing * cargo fmt --- cli/Cargo.toml | 2 +- cli/build.rs | 35 +++++++++++++++++++++++++++++++++++ cli/src/commands/mod.rs | 1 + cli/src/commands/version.rs | 16 ++++++++++++++++ cli/src/main.rs | 2 ++ 5 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 cli/build.rs create mode 100644 cli/src/commands/version.rs diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 9a9b1b527a..ea0fa5ce57 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -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 diff --git a/cli/build.rs b/cli/build.rs new file mode 100644 index 0000000000..0e4f3e2614 --- /dev/null +++ b/cli/build.rs @@ -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"); +} diff --git a/cli/src/commands/mod.rs b/cli/src/commands/mod.rs index 3b5093741b..4ff1876522 100644 --- a/cli/src/commands/mod.rs +++ b/cli/src/commands/mod.rs @@ -5,3 +5,4 @@ pub mod codegen; pub mod compatibility; pub mod metadata; +pub mod version; diff --git a/cli/src/commands/version.rs b/cli/src/commands/version.rs new file mode 100644 index 0000000000..397a322fcf --- /dev/null +++ b/cli/src/commands/version.rs @@ -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(()) +} diff --git a/cli/src/main.rs b/cli/src/main.rs index bdfcf7422d..a56e8b55d0 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -13,6 +13,7 @@ enum Command { Metadata(commands::metadata::Opts), Codegen(commands::codegen::Opts), Compatibility(commands::compatibility::Opts), + Version(commands::version::Opts), } #[tokio::main] @@ -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), } }