From 630e00ee20b81be63a8025a0d1db47d95a6467db Mon Sep 17 00:00:00 2001 From: Satyam Singh Date: Wed, 12 Oct 2022 21:01:54 +0530 Subject: [PATCH] Use vergen crate --- server/Cargo.toml | 1 + server/build.rs | 10 ++++++++++ server/src/banner.rs | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/server/Cargo.toml b/server/Cargo.toml index 901afb8be..ed0c1e5af 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -57,6 +57,7 @@ static-files = "0.2.1" cargo_toml = "0.11.5" ureq = "2.5.0" sha1_smol = { version = "1.0.0", features=["std"] } +vergen = { version = "7.4.2", features = ["build", "git"] } zip = { git = "https://github.com/zip-rs/zip" } [dev-dependencies] diff --git a/server/build.rs b/server/build.rs index 8c6885a2f..f52aa6ae7 100644 --- a/server/build.rs +++ b/server/build.rs @@ -16,7 +16,17 @@ * */ +use vergen::{vergen, Config}; + fn main() { + // Init vergen + if let Err(e) = vergen(Config::default()) { + println!( + "cargo:warning=initializing vergen failed due to error: {}", + e + ); + } + println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-changed=Cargo.toml"); println!("cargo:rerun-if-env-changed=LOCAL_ASSETS_PATH"); diff --git a/server/src/banner.rs b/server/src/banner.rs index e99cf1a55..46201afd4 100644 --- a/server/src/banner.rs +++ b/server/src/banner.rs @@ -92,8 +92,8 @@ pub mod version { } fn current_version() -> Version { - let current_version = env!("CARGO_PKG_VERSION"); - semver::Version::parse(current_version).expect("CARGO_PKG_VERSION is always valid semver") + let current_version = env!("VERGEN_BUILD_SEMVER"); + semver::Version::parse(current_version).expect("VERGEN_BUILD_SEMVER is always valid semver") } fn humanize_time(time_passed: Duration) -> String {