Merge #1652 #1654 #1657

1652: Remove dependabot r=MarinPostma a=curquiza

Fixes #1649 

Dependabot for vulnerability and security updates is still activated.

1654: Add Script for Windows r=MarinPostma a=singh08prashant

fixes #1570 

changes:

1. added script for detecting windows os running git bash
2. appended `.exe` to `$release_file` for windows as listed [here](https://github.com/meilisearch/MeiliSearch/releases/)
3. removed global `$BINARY_NAME='meilisearch'` as windows require `.exe` file

1657: Bring vergen hotfix from `stable` to `main` r=MarinPostma a=curquiza



Co-authored-by: Clémentine Urquizar <clementine@meilisearch.com>
Co-authored-by: singh08prashant <singh08prashant@gmail.com>
Co-authored-by: Kerollmops <clement@meilisearch.com>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "monthly"

Cargo.lock

@@ -1554,14 +1554,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",
@@ -3169,9 +3169,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",

download-latest.sh

@@ -6,7 +6,6 @@ GREEN='\033[32m'
 DEFAULT='\033[0m'
 
 # GLOBALS
-BINARY_NAME='meilisearch'
 GREP_SEMVER_REGEXP='v\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)$' # i.e. v[number].[number].[number]
 
 # FUNCTIONS
@@ -127,6 +126,9 @@ get_os() {
     'Linux')
         os='linux'
         ;;
+	'MINGW'*)
+        os='windows'
+        ;;
     *)
         return 1
     esac
@@ -180,7 +182,17 @@ if ! get_archi; then
 fi
 
 echo "Downloading MeiliSearch binary $latest for $os, architecture $archi..."
-release_file="meilisearch-$os-$archi"
+case "$os" in
+    'windows')
+        release_file="meilisearch-$os-$archi.exe"
+		BINARY_NAME='meilisearch.exe'
+
+        ;;
+	*) 
+		release_file="meilisearch-$os-$archi"
+		BINARY_NAME='meilisearch'
+
+esac
 link="https://github.com/meilisearch/MeiliSearch/releases/download/$latest/$release_file"
 curl -OL "$link"
 mv "$release_file" "$BINARY_NAME"

meilisearch-error/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "meilisearch-error"
-version = "0.21.0"
+version = "0.21.1"
 authors = ["marin <postma.marin@protonmail.com>"]
 edition = "2018"
 

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"
@@ -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]

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");

meilisearch-http/src/main.rs

@@ -72,14 +72,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") {
+    let commit_sha = option_env!("VERGEN_GIT_SHA").unwrap_or("unknown");
-        Some("") | None => env!("VERGEN_GIT_SHA"),
+    let commit_date = option_env!("VERGEN_GIT_COMMIT_TIMESTAMP").unwrap_or("unknown");
-        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 ascii_name = r#"
 888b     d888          d8b 888 d8b  .d8888b.                                    888

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") {
+    let commit_sha = option_env!("VERGEN_GIT_SHA").unwrap_or("unknown");
-        Some("") | None => env!("VERGEN_GIT_SHA"),
+    let commit_date = option_env!("VERGEN_GIT_COMMIT_TIMESTAMP").unwrap_or("unknown");
-        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,
-    };
 
     HttpResponse::Ok().json(VersionResponse {
         commit_sha: commit_sha.to_string(),