Skip to content

Commit fbb7807

Browse files
Merge #685
685: Adapt script to update macro version r=curquiza a=curquiza Following merge of this PR #682 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Chores** * Updated the process for managing macro dependency versions, so only the macro's own version is updated automatically, while the main dependency declaration remains unchanged. * Simplified version tag checks during release validation by removing redundant comparisons and related error messages. <!-- end of auto-generated comment: release notes by coderabbit.ai --> Co-authored-by: Clémentine <clementine@meilisearch.com> Co-authored-by: curquiza <clementine@meilisearch.com>
2 parents f9f4e53 + d75acf4 commit fbb7807

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

.github/scripts/check-release.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,19 @@ 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]+')
1413
file_tag2=$(grep 'meilisearch-sdk = ' $file2 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
1514
file_tag3=$(grep 'meilisearch-sdk = ' $file3 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
1615
file_tag4=$(grep 'meilisearch-sdk = ' $file4 | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
1716
file_tag5=$(grep '^version = ' $file5 | grep -Eo '[0-9]+.[0-9]+.[0-9]+')
1817

1918
if [ "$current_tag" != "$file_tag1" ] ||
20-
[ "$current_tag" != "$file_tag_1_1" ] ||
2119
[ "$current_tag" != "$file_tag2" ] ||
2220
[ "$current_tag" != "$file_tag3" ] ||
2321
[ "$current_tag" != "$file_tag4" ] ||
2422
[ "$current_tag" != "$file_tag5" ] \
2523
; then
2624
echo "Error: the current tag does not match the version in package file(s)."
2725
echo "$file1: found $file_tag1 - expected $current_tag"
28-
echo "$file1: found $file_tag_1_1 - expected $current_tag"
2926
echo "$file2: found $file_tag2 - expected $current_tag"
3027
echo "$file3: found $file_tag3 - expected $current_tag"
3128
echo "$file4: found $file_tag4 - expected $current_tag"

scripts/update_macro_versions.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ 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)