From a8c146fd13f6ce0c12967b3ef61f09237b804055 Mon Sep 17 00:00:00 2001
From: Kerollmops <clement@meilisearch.com>
Date: Mon, 30 Aug 2021 17:41:24 +0200
Subject: [PATCH] Unwrap or unknown the commit hash

---
 meilisearch-http/build.rs          |  4 +++-
 meilisearch-http/src/main.rs       | 10 ++--------
 meilisearch-http/src/routes/mod.rs | 10 ++--------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/meilisearch-http/build.rs b/meilisearch-http/build.rs
index e33acc892..41f429ba1 100644
--- a/meilisearch-http/build.rs
+++ b/meilisearch-http/build.rs
@@ -1,7 +1,9 @@
 use vergen::{vergen, Config};
 
 fn main() {
-    vergen(Config::default()).unwrap();
+    if let Err(e) = vergen(Config::default()) {
+        println!("cargo:warning=vergen: {}", e);
+    }
 
     #[cfg(feature = "mini-dashboard")]
     mini_dashboard::setup_mini_dashboard().expect("Could not load the mini-dashboard assets");
diff --git a/meilisearch-http/src/main.rs b/meilisearch-http/src/main.rs
index 78dacd640..ac9f7e364 100644
--- a/meilisearch-http/src/main.rs
+++ b/meilisearch-http/src/main.rs
@@ -104,14 +104,8 @@ async fn run_http(data: Data, opt: Opt) -> Result<(), Box<dyn std::error::Error>
 }
 
 pub fn print_launch_resume(opt: &Opt, data: &Data) {
-    let commit_sha = match option_env!("COMMIT_SHA") {
-        Some("") | None => env!("VERGEN_GIT_SHA"),
-        Some(commit_sha) => commit_sha,
-    };
-    let commit_date = match option_env!("COMMIT_DATE") {
-        Some("") | None => env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
-        Some(commit_date) => commit_date,
-    };
+    let commit_sha = option_env!("VERGEN_GIT_SHA").unwrap_or("unknown");
+    let commit_date = option_env!("VERGEN_GIT_COMMIT_TIMESTAMP").unwrap_or("unknown");
 
     let ascii_name = r#"
 888b     d888          d8b 888 d8b  .d8888b.                                    888
diff --git a/meilisearch-http/src/routes/mod.rs b/meilisearch-http/src/routes/mod.rs
index 184616892..2bacf9ed6 100644
--- a/meilisearch-http/src/routes/mod.rs
+++ b/meilisearch-http/src/routes/mod.rs
@@ -245,14 +245,8 @@ struct VersionResponse {
 }
 
 async fn get_version(_data: GuardedData<Private, Data>) -> HttpResponse {
-    let commit_sha = match option_env!("COMMIT_SHA") {
-        Some("") | None => env!("VERGEN_GIT_SHA"),
-        Some(commit_sha) => commit_sha,
-    };
-    let commit_date = match option_env!("COMMIT_DATE") {
-        Some("") | None => env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
-        Some(commit_date) => commit_date,
-    };
+    let commit_sha = option_env!("VERGEN_GIT_SHA").unwrap_or("unknown");
+    let commit_date = option_env!("VERGEN_GIT_COMMIT_TIMESTAMP").unwrap_or("unknown");
 
     HttpResponse::Ok().json(VersionResponse {
         commit_sha: commit_sha.to_string(),