From fc5d0c0c1f14c496f3a0006c6801e6724b7fd2b8 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 17 Jul 2020 11:25:29 +0200 Subject: [PATCH 1/2] Initial commit Forked at: 640dd1a0a44b6f28af1189f0293ab272ebc9d2eb Parent branch: origin/master From 20ef67c554094325487a25aacb7c074c33c24423 Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 17 Jul 2020 11:26:29 +0200 Subject: [PATCH 2/2] Change unknown-commit to unknown to make parsing easier --- bin/node/cli/tests/version.rs | 2 +- utils/build-script-utils/src/version.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/node/cli/tests/version.rs b/bin/node/cli/tests/version.rs index c5240257f16de..bbc9139d4f0f8 100644 --- a/bin/node/cli/tests/version.rs +++ b/bin/node/cli/tests/version.rs @@ -22,7 +22,7 @@ use regex::Regex; use std::process::Command; fn expected_regex() -> Regex { - Regex::new(r"^substrate (\d+\.\d+\.\d+(?:-.+?)?)-([a-f\d]+|unknown-commit)-(.+?)-(.+?)(?:-(.+))?$").unwrap() + Regex::new(r"^substrate (\d+\.\d+\.\d+(?:-.+?)?)-([a-f\d]+|unknown)-(.+?)-(.+?)(?:-(.+))?$").unwrap() } #[test] diff --git a/utils/build-script-utils/src/version.rs b/utils/build-script-utils/src/version.rs index eefd3315921a6..103fd5b1d24ac 100644 --- a/utils/build-script-utils/src/version.rs +++ b/utils/build-script-utils/src/version.rs @@ -31,11 +31,11 @@ pub fn generate_cargo_keys() { } Ok(o) => { println!("cargo:warning=Git command failed with status: {}", o.status); - Cow::from("unknown-commit") + Cow::from("unknown") }, Err(err) => { println!("cargo:warning=Failed to execute git command: {}", err); - Cow::from("unknown-commit") + Cow::from("unknown") }, };