Skip to content

Commit 2ade385

Browse files
bors[bot]bidoubiwa
andauthored
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]>
2 parents 10d0338 + b3169f3 commit 2ade385

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

.github/scripts/check-release.sh

+1-4
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@ file_tag2=$(grep 'meilisearch-sdk = ' $file2 | cut -d '=' -f 2 | tr -d '"' | tr
1717
file_tag3=$(grep 'meilisearch-sdk = ' $file3 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
1818
file_tag4=$(grep 'meilisearch-sdk = ' $file4 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
1919
file_tag5=$(grep '^version = ' $file5 | grep -Eo '[0-9]+.[0-9]+.[0-9]+')
20-
file_tag5_1=$(grep '{ path = \"..\", version =' $file5 | grep -Eo '[0-9]+.[0-9]+.[0-9]+')
2120

2221
if [ "$current_tag" != "$file_tag1" ] ||
2322
[ "$current_tag" != "$file_tag_1_1" ] ||
2423
[ "$current_tag" != "$file_tag2" ] ||
2524
[ "$cropped_current_tag" != "$file_tag3" ] ||
2625
[ "$current_tag" != "$file_tag4" ] ||
27-
[ "$current_tag" != "$file_tag5" ] ||
28-
[ "$current_tag" != "$file_tag5_1" ] \
26+
[ "$current_tag" != "$file_tag5" ] \
2927
; then
3028
echo "Error: the current tag does not match the version in package file(s)."
3129
echo "$file1: found $file_tag1 - expected $current_tag"
@@ -34,7 +32,6 @@ if [ "$current_tag" != "$file_tag1" ] ||
3432
echo "$file3: found $file_tag3 - expected $cropped_current_tag"
3533
echo "$file4: found $file_tag4 - expected $current_tag"
3634
echo "$file5: found $file_tag5 - expected $current_tag"
37-
echo "$file5: found $file_tag5_1 - expected $current_tag"
3835
exit 1
3936
fi
4037

meilisearch-index-setting-macro/Cargo.toml

-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ quote = "1.0.21"
1616
proc-macro2 = "1.0.46"
1717
convert_case = "0.6.0"
1818

19-
[dev-dependencies]
20-
meilisearch-sdk = { path = "..", version = "0.22.0" }
21-

scripts/update_macro_versions.sh

-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ new_version=$(cat Cargo.toml | grep '^version = ')
44
# Updates the versions in meilisearch-rust and meilisearch-index-setting-macro of the latter, with the latest meilisearch-rust version.
55

66
old_index_macro_version=$(cat ./meilisearch-index-setting-macro/Cargo.toml | grep '^version = ')
7-
old_sdk_in_macro_version=$(cat ./meilisearch-index-setting-macro/Cargo.toml | grep 'meilisearch-sdk = { path = "..", version = ')
87
old_macro_in_sdk_version=$(cat ./Cargo.toml | grep '{ path = "meilisearch-index-setting-macro", version =')
98

109
sed -i '' -e "s/^$old_index_macro_version/$new_version/g" './meilisearch-index-setting-macro/Cargo.toml'
11-
sed -i '' -e "s/^$old_sdk_in_macro_version/meilisearch-sdk = { path = \"..\", $new_version }/g" './meilisearch-index-setting-macro/Cargo.toml'
1210
sed -i '' -e "s/$old_macro_in_sdk_version/meilisearch-index-setting-macro = { path = \"meilisearch-index-setting-macro\", $new_version }/g" './Cargo.toml'

0 commit comments

Comments
 (0)