Skip to content

Commit 83cdb4a

Browse files
committed
Revert "Merge #685"
This reverts commit fbb7807, reversing changes made to f9f4e53.
1 parent fbb7807 commit 83cdb4a

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

.github/scripts/check-release.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,22 @@ file4='README.md'
1010
file5='./meilisearch-index-setting-macro/Cargo.toml'
1111

1212
file_tag1=$(grep '^version = ' $file1 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
13+
file_tag_1_1=$(grep '{ path = "meilisearch-index-setting-macro", version =' $file1 | grep -Eo '[0-9]+.[0-9]+.[0-9]+')
1314
file_tag2=$(grep 'meilisearch-sdk = ' $file2 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
1415
file_tag3=$(grep 'meilisearch-sdk = ' $file3 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
1516
file_tag4=$(grep 'meilisearch-sdk = ' $file4 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
1617
file_tag5=$(grep '^version = ' $file5 | grep -Eo '[0-9]+.[0-9]+.[0-9]+')
1718

1819
if [ "$current_tag" != "$file_tag1" ] ||
20+
[ "$current_tag" != "$file_tag_1_1" ] ||
1921
[ "$current_tag" != "$file_tag2" ] ||
2022
[ "$current_tag" != "$file_tag3" ] ||
2123
[ "$current_tag" != "$file_tag4" ] ||
2224
[ "$current_tag" != "$file_tag5" ] \
2325
; then
2426
echo "Error: the current tag does not match the version in package file(s)."
2527
echo "$file1: found $file_tag1 - expected $current_tag"
28+
echo "$file1: found $file_tag_1_1 - expected $current_tag"
2629
echo "$file2: found $file_tag2 - expected $current_tag"
2730
echo "$file3: found $file_tag3 - expected $current_tag"
2831
echo "$file4: found $file_tag4 - expected $current_tag"

scripts/update_macro_versions.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ old_index_macro_version=$(grep '^version = ' ./meilisearch-index-setting-macro/C
77
old_macro_in_sdk_version=$(grep '{ path = "meilisearch-index-setting-macro", version =' ./Cargo.toml)
88

99
sed -i '' -e "s/^$old_index_macro_version/$new_version/g" './meilisearch-index-setting-macro/Cargo.toml'
10+
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)