searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-29 16:24:26 +01:00
Code Issues Releases Wiki Activity

Ignore -dirty flag

Browse Source
This commit is contained in:
Louis Dureuil 2023-02-09 16:27:18 +01:00
parent a341c94871
commit 9bd1cfb3a3
No known key found for this signature in database
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meilisearch/build.rs
View File

@ -4,8 +4,6 @@ fn main() {
let mut config = Config::default(); let mut config = Config::default();
// allow using non-annotated tags // allow using non-annotated tags
*config.git_mut().semver_kind_mut() = SemverKind::Lightweight; *config.git_mut().semver_kind_mut() = SemverKind::Lightweight;
// add -dirty suffix when we're not right on the tag
*config.git_mut().semver_dirty_mut() = Some("-dirty");
if let Err(e) = vergen(config) { if let Err(e) = vergen(config) {
println!("cargo:warning=vergen: {}", e); println!("cargo:warning=vergen: {}", e);

9
meilisearch/src/lib.rs
View File

@ -435,18 +435,13 @@ pub fn configure_metrics_route(config: &mut web::ServiceConfig, enable_metrics_r
/// Returns `Some(prototype_name)` if the following conditions are met on this value: /// Returns `Some(prototype_name)` if the following conditions are met on this value:
/// ///
/// 1. starts with `prototype-`, /// 1. starts with `prototype-`,
/// 2. does not end with `dirty-`, /// 2. ends with `-<some_number>`,
/// 3. ends with `-<some_number>`, /// 3. does not end with `<some_number>-<some_number>`.
/// 4. does not end with `<some_number>-<some_number>`.
/// ///
/// Otherwise, returns `None`. /// Otherwise, returns `None`.
pub fn prototype_name() -> Option<&'static str> { pub fn prototype_name() -> Option<&'static str> {
let prototype: &'static str = option_env!("VERGEN_GIT_SEMVER_LIGHTWEIGHT")?; let prototype: &'static str = option_env!("VERGEN_GIT_SEMVER_LIGHTWEIGHT")?;
if prototype.ends_with("-dirty") {
return None;
}
if !prototype.starts_with("prototype-") { if !prototype.starts_with("prototype-") {
return None; return None;
} }