From 32c8846514dba7ea03b169c3002bf8365dd714ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9mentine=20Urquizar?= Date: Wed, 22 Jun 2022 12:20:12 +0200 Subject: [PATCH] Rollback 0.0.0 versionning --- .github/scripts/check-release.sh | 20 +++++++++++--------- Cargo.lock | 6 +++--- meilisearch-lib/Cargo.toml | 2 +- meilisearch-types/Cargo.toml | 2 +- permissive-json-pointer/Cargo.toml | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/scripts/check-release.sh b/.github/scripts/check-release.sh index bad957cff..3c8dd64a7 100644 --- a/.github/scripts/check-release.sh +++ b/.github/scripts/check-release.sh @@ -3,24 +3,26 @@ # check_tag $current_tag $file_tag $file_name function check_tag { if [ "$1" != "$2" ]; then - echo "Error: the current tag does not match the version in $3:" - echo "Found $1 - expected $2" - exit 1 + echo "Error: the current tag does not match the version in $3: found $1 - expected $2" + ret=1 fi } +ret=0 current_tag=$(echo $GITHUB_REF | tr -d 'refs/tags/v') -files='*/Cargo.toml' -for file in $files; +toml_files='*/Cargo.toml' +for toml_file in $toml_files; do - file_tag="$(grep '^version = ' $file | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')" - check_tag $current_tag $file_tag $file + file_tag="$(grep '^version = ' $toml_file | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')" + check_tag $current_tag $file_tag $toml_file done lock_file='Cargo.lock' lock_tag=$(grep -A 1 'name = "meilisearch-auth"' $lock_file | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d ' ') check_tag $current_tag $lock_tag $lock_file -echo 'OK' -exit 0 +if [ "$ret" -eq 0 ] ; then + echo 'OK' +fi +exit $ret diff --git a/Cargo.lock b/Cargo.lock index f736ebecb..ff2325361 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2092,7 +2092,7 @@ dependencies = [ [[package]] name = "meilisearch-lib" -version = "0.0.0" +version = "0.28.0" dependencies = [ "actix-rt", "actix-web", @@ -2154,7 +2154,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "0.0.0" +version = "0.28.0" dependencies = [ "actix-web", "proptest", @@ -2515,7 +2515,7 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "permissive-json-pointer" -version = "0.0.0" +version = "0.28.0" dependencies = [ "big_s", "serde_json", diff --git a/meilisearch-lib/Cargo.toml b/meilisearch-lib/Cargo.toml index d9603e1d5..094c79901 100644 --- a/meilisearch-lib/Cargo.toml +++ b/meilisearch-lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "meilisearch-lib" -version = "0.0.0" +version = "0.28.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/meilisearch-types/Cargo.toml b/meilisearch-types/Cargo.toml index 1614f5b34..6949722e7 100644 --- a/meilisearch-types/Cargo.toml +++ b/meilisearch-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "meilisearch-types" -version = "0.0.0" +version = "0.28.0" authors = ["marin "] edition = "2021" diff --git a/permissive-json-pointer/Cargo.toml b/permissive-json-pointer/Cargo.toml index 9e01f8807..9e01b81ab 100644 --- a/permissive-json-pointer/Cargo.toml +++ b/permissive-json-pointer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "permissive-json-pointer" -version = "0.0.0" +version = "0.28.0" edition = "2021" description = "A permissive json pointer" readme = "README.md"