Merge #423

423: Remove unused devdependency in macro r=irevoire a=bidoubiwa It is unused and causes a circular dependency issue when trying to publish Co-authored-by: Charlotte Vermandel <[email protected]>
meilisearch · Feb 6, 2023 · 2ade385 · 2ade385
2 parents 10d0338 + b3169f3
commit 2ade385
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/.github/scripts/check-release.sh b/.github/scripts/check-release.sh
@@ -17,15 +17,13 @@ file_tag2=$(grep 'meilisearch-sdk = ' $file2 | cut -d '=' -f 2 | tr -d '"' | tr
 file_tag3=$(grep 'meilisearch-sdk = ' $file3 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
 file_tag4=$(grep 'meilisearch-sdk = ' $file4 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
 file_tag5=$(grep '^version = ' $file5 | grep -Eo '[0-9]+.[0-9]+.[0-9]+')
-file_tag5_1=$(grep '{ path = \"..\", version =' $file5 | grep -Eo '[0-9]+.[0-9]+.[0-9]+')
 
 if [ "$current_tag" != "$file_tag1" ] ||
   [ "$current_tag" != "$file_tag_1_1" ] ||
   [ "$current_tag" != "$file_tag2" ] ||
   [ "$cropped_current_tag" != "$file_tag3" ] ||
   [ "$current_tag" != "$file_tag4" ] ||
-  [ "$current_tag" != "$file_tag5" ] ||
-  [ "$current_tag" != "$file_tag5_1" ] \
+  [ "$current_tag" != "$file_tag5" ] \
   ; then
   echo "Error: the current tag does not match the version in package file(s)."
   echo "$file1: found $file_tag1 - expected $current_tag"
@@ -34,7 +32,6 @@ if [ "$current_tag" != "$file_tag1" ] ||
   echo "$file3: found $file_tag3 - expected $cropped_current_tag"
   echo "$file4: found $file_tag4 - expected $current_tag"
   echo "$file5: found $file_tag5 - expected $current_tag"
-  echo "$file5: found $file_tag5_1 - expected $current_tag"
   exit 1
 fi
 

diff --git a/meilisearch-index-setting-macro/Cargo.toml b/meilisearch-index-setting-macro/Cargo.toml
@@ -16,6 +16,3 @@ quote = "1.0.21"
 proc-macro2 = "1.0.46"
 convert_case = "0.6.0"
 
-[dev-dependencies]
-meilisearch-sdk = { path = "..", version = "0.22.0" }
-
diff --git a/scripts/update_macro_versions.sh b/scripts/update_macro_versions.sh
@@ -4,9 +4,7 @@ new_version=$(cat Cargo.toml | grep '^version = ')
 # Updates the versions in meilisearch-rust and meilisearch-index-setting-macro of the latter, with the latest meilisearch-rust version.
 
 old_index_macro_version=$(cat ./meilisearch-index-setting-macro/Cargo.toml | grep '^version = ')
-old_sdk_in_macro_version=$(cat ./meilisearch-index-setting-macro/Cargo.toml | grep 'meilisearch-sdk = { path = "..", version = ')
 old_macro_in_sdk_version=$(cat ./Cargo.toml | grep '{ path = "meilisearch-index-setting-macro", version =')
 
 sed -i '' -e "s/^$old_index_macro_version/$new_version/g" './meilisearch-index-setting-macro/Cargo.toml'
-sed -i '' -e "s/^$old_sdk_in_macro_version/meilisearch-sdk = { path = \"..\", $new_version }/g" './meilisearch-index-setting-macro/Cargo.toml'
 sed -i '' -e "s/$old_macro_in_sdk_version/meilisearch-index-setting-macro = { path = \"meilisearch-index-setting-macro\", $new_version }/g" './Cargo.toml'