From e35c630c1d2fe9621cc43dd86596aaaca8a56d2e Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Fri, 10 Jan 2025 16:37:36 +0300 Subject: [PATCH] Format version as calver automatically --- src/utils/mod.rs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/utils/mod.rs b/src/utils/mod.rs index e5516506d..b213205bc 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -83,11 +83,25 @@ pub fn version() -> String { return String::from(v); } - let version = env!("CARGO_PKG_VERSION"); + const MAJOR: &str = env!("CARGO_PKG_VERSION_MAJOR"); + const MINOR: &str = env!("CARGO_PKG_VERSION_MINOR"); + const PATCH: &str = env!("CARGO_PKG_VERSION_PATCH"); + + let minor_prefix = if MINOR.len() == 1 { + // Print single-digit months in '0M' format. + "0" + } else { + "" + }; + let commit = option_env!("NIRI_BUILD_COMMIT").unwrap_or(git_version!(fallback = "unknown commit")); - format!("{version} ({commit})") + if PATCH == "0" { + format!("{MAJOR}.{minor_prefix}{MINOR} ({commit})") + } else { + format!("{MAJOR}.{minor_prefix}{MINOR}.{PATCH} ({commit})") + } } pub fn get_monotonic_time() -> Duration {