Skip to content

Commit 6b70ca4

Browse files
authored
Use vergen crate (#164)
Partially fixes #132
1 parent e085165 commit 6b70ca4

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

server/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ static-files = "0.2.1"
5757
cargo_toml = "0.11.5"
5858
ureq = "2.5.0"
5959
sha1_smol = { version = "1.0.0", features=["std"] }
60+
vergen = { version = "7.4.2", features = ["build", "git"] }
6061
zip = { git = "https://github.com/zip-rs/zip" }
6162

6263
[dev-dependencies]

server/build.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,17 @@
1616
*
1717
*/
1818

19+
use vergen::{vergen, Config};
20+
1921
fn main() {
22+
// Init vergen
23+
if let Err(e) = vergen(Config::default()) {
24+
println!(
25+
"cargo:warning=initializing vergen failed due to error: {}",
26+
e
27+
);
28+
}
29+
2030
println!("cargo:rerun-if-changed=build.rs");
2131
println!("cargo:rerun-if-changed=Cargo.toml");
2232
println!("cargo:rerun-if-env-changed=LOCAL_ASSETS_PATH");

server/src/banner.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ pub mod version {
9292
}
9393

9494
fn current_version() -> Version {
95-
let current_version = env!("CARGO_PKG_VERSION");
96-
semver::Version::parse(current_version).expect("CARGO_PKG_VERSION is always valid semver")
95+
let current_version = env!("VERGEN_BUILD_SEMVER");
96+
semver::Version::parse(current_version).expect("VERGEN_BUILD_SEMVER is always valid semver")
9797
}
9898

9999
fn humanize_time(time_passed: Duration) -> String {

0 commit comments

Comments
 (0)