From 8d5d7395689af3ffdd6d699f5bd2d40bd9ec05c8 Mon Sep 17 00:00:00 2001 From: blek Date: Sun, 29 Oct 2023 19:14:58 +1000 Subject: [PATCH] include branch data --- filed/build.rs | 4 +++- filed/src/env.rs | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/filed/build.rs b/filed/build.rs index fde6fbd..dddb33f 100644 --- a/filed/build.rs +++ b/filed/build.rs @@ -69,6 +69,8 @@ fn main() { }); let commit = system("git", &["rev-parse", "HEAD"]); - + let branch = system("git", &["rev-parse", "--abbrev-rev", "HEAD"]); + println!("cargo:rustc-env=COMMIT_HASH={commit}"); + println!("cargo:rustc-env=COMMIT_BRANCH={branch}"); } \ No newline at end of file diff --git a/filed/src/env.rs b/filed/src/env.rs index ecd295f..4f43568 100644 --- a/filed/src/env.rs +++ b/filed/src/env.rs @@ -17,12 +17,15 @@ pub struct Redis { #[derive(Debug, Clone)] pub struct VersionData { - pub commit: String + pub commit: String, + pub branch: String } + impl Default for VersionData { fn default() -> Self { VersionData { - commit: env!("COMMIT_HASH").to_string() + commit: env!("COMMIT_HASH").to_string(), + branch: env!("COMMIT_BRANCH").to_string() } } }