openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File use-env.patch of Package vector (Revision 5e6bfcbf93b8eb09f85fa483ff2f24af)

Currently displaying revision 5e6bfcbf93b8eb09f85fa483ff2f24af , Show latest

diff --git a/build.rs b/build.rs
index 5419a99b1..f860c4013 100644
--- a/build.rs
+++ b/build.rs
@@ -93,17 +93,20 @@ impl BuildConstants {
     }
 }
 
-fn git_short_hash() -> std::io::Result<String> {
-    let output_result = Command::new("git")
-        .args(["rev-parse", "--short", "HEAD"])
-        .output();
-
-    output_result.map(|output| {
-        let mut hash = String::from_utf8(output.stdout).expect("valid UTF-8");
-        hash.retain(|c| !c.is_ascii_whitespace());
+fn git_short_hash() -> String {
+    let out = match std::env::var("GIT_HASH_SHORT") {
+        Ok(v) => v,
+        Err(_) => {
+            let output = Command::new("git")
+                .args(["rev-parse", "--short", "HEAD"])
+                .output()
+                .expect("failed to execute git rev-parse to read the current git hash");
+            String::from_utf8(output.stdout).expect("non-utf8 found in git hash")
+        }
+    };
 
-        hash
-    })
+    assert!(!out.is_empty(), "attempting to embed empty git hash");
+    out
 }
 
 fn main() {
@@ -200,17 +203,7 @@ fn main() {
     // In CI build workflows this will have been pre-configured by running the command
     // "git config --global --add safe.directory /git/vectordotdev/vector", from the vdev package
     // subcommands.
-    let git_short_hash = git_short_hash()
-        .map_err(|e| {
-            #[allow(clippy::print_stderr)]
-            {
-                eprintln!(
-                    "Unable to determine git short hash from rev-parse command: {}",
-                    e
-                );
-            }
-        })
-        .expect("git hash detection failed");
+    let git_short_hash = git_short_hash();
 
     // Gather up the constants and write them out to our build constants file.
     let mut constants = BuildConstants::new();

Places

File use-env.patch of Package vector (Revision 5e6bfcbf93b8eb09f85fa483ff2f24af)

Places