From 17827533876da55f2dc2763150b1c86d5f2bd917 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Thu, 26 Aug 2021 15:08:43 +0200 Subject: [PATCH 1/3] Bump vergen and remove unused build feature --- Cargo.lock | 4 ++-- meilisearch-http/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 43222363e..14aefc845 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3388,9 +3388,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vergen" -version = "5.1.13" +version = "5.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f37b4798c879409865dde7908e746d836f77839c3a6bea5c8b4e4dcf6620b" +checksum = "265455aab08c55a1ab13f07c8d5e25c7d46900f4484dd7cbd682e77171f93f3c" dependencies = [ "anyhow", "cfg-if 1.0.0", diff --git a/meilisearch-http/Cargo.toml b/meilisearch-http/Cargo.toml index 0f8a5e21f..076f5f710 100644 --- a/meilisearch-http/Cargo.toml +++ b/meilisearch-http/Cargo.toml @@ -18,7 +18,7 @@ hex = { version = "0.4.3", optional = true } reqwest = { version = "0.11.3", features = ["blocking", "rustls-tls"], default-features = false, optional = true } sha-1 = { version = "0.9.4", optional = true } tempfile = { version = "3.1.0", optional = true } -vergen = { version = "5.1.13", default-features = false, features = ["build", "git"] } +vergen = { version = "5.1.15", default-features = false, features = ["git"] } zip = { version = "0.5.12", optional = true } [dependencies] From a8c146fd13f6ce0c12967b3ef61f09237b804055 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Mon, 30 Aug 2021 17:41:24 +0200 Subject: [PATCH 2/3] 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 } 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) -> 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(), From b8c954eb3f340bcdb3346b4a255e253a895e5512 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Mon, 30 Aug 2021 15:06:06 +0200 Subject: [PATCH 3/3] Bump the MeiliSearch version to v0.21.1 --- Cargo.lock | 4 ++-- meilisearch-error/Cargo.toml | 2 +- meilisearch-http/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 14aefc845..60e081e87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1617,14 +1617,14 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "meilisearch-error" -version = "0.21.0" +version = "0.21.1" dependencies = [ "actix-http", ] [[package]] name = "meilisearch-http" -version = "0.21.0" +version = "0.21.1" dependencies = [ "actix-cors", "actix-http", diff --git a/meilisearch-error/Cargo.toml b/meilisearch-error/Cargo.toml index b06ea4df6..4b14d07d3 100644 --- a/meilisearch-error/Cargo.toml +++ b/meilisearch-error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "meilisearch-error" -version = "0.21.0" +version = "0.21.1" authors = ["marin "] edition = "2018" diff --git a/meilisearch-http/Cargo.toml b/meilisearch-http/Cargo.toml index 076f5f710..4aff348ef 100644 --- a/meilisearch-http/Cargo.toml +++ b/meilisearch-http/Cargo.toml @@ -4,7 +4,7 @@ description = "MeiliSearch HTTP server" edition = "2018" license = "MIT" name = "meilisearch-http" -version = "0.21.0" +version = "0.21.1" [[bin]] name = "meilisearch"