Skip to content

Commit 8ca79d7

Browse files
committed
improve var names and comments
1 parent 6590bf4 commit 8ca79d7

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

script/release

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ set -e
2323
# 7. Set 'is_major_release' variable
2424
# 8. Point separate major release tag (e.g. v1, v2) to the new release
2525
# 9. Push the new tags (with commits, if any) to remote
26-
# 10. If this is a major release, create a 'releases/(latest_major_tag)' branch and push
26+
# 10. If this is a major release, create a 'releases/v#' branch and push
2727
#
2828
# Usage:
2929
#
3030
# script/release
3131

3232
# Variables
33-
tag_regex='v[0-9]+\.[0-9]+\.[0-9]+$'
34-
tag_glob='v[0-9].[0-9].[0-9]*'
33+
semver_tag_regex='v[0-9]+\.[0-9]+\.[0-9]+$'
34+
semver_tag_glob='v[0-9].[0-9].[0-9]*'
3535
git_remote='origin'
36-
major_tag_regex='\(v[0-9]*\)'
36+
major_semver_tag_regex='\(v[0-9]*\)'
3737

3838
# Terminal colors
3939
OFF='\033[0m'
@@ -45,7 +45,7 @@ BOLD_UNDERLINED='\033[1;4m'
4545
BOLD='\033[1m'
4646

4747
# 1. Retrieve the latest release tag
48-
if ! latest_tag=$(git describe --abbrev=0 --match="$tag_glob"); then
48+
if ! latest_tag=$(git describe --abbrev=0 --match="$semver_tag_glob"); then
4949
# There are no existing release tags
5050
echo -e "No tags found (yet) - Continue to create and push your first tag"
5151
latest_tag="[unknown]"
@@ -58,7 +58,7 @@ echo -e "The latest release tag is: ${BOLD_BLUE}${latest_tag}${OFF}"
5858
read -r -p 'Enter a new release tag (vX.X.X format): ' new_tag
5959

6060
# 4. Validate the new release tag
61-
if echo "$new_tag" | grep -q -E "$tag_regex"; then
61+
if echo "$new_tag" | grep -q -E "$semver_tag_regex"; then
6262
# Release tag is valid
6363
echo -e "Tag: ${BOLD_BLUE}$new_tag${OFF} is valid syntax"
6464
else
@@ -82,44 +82,44 @@ git tag "$new_tag" --annotate --message "$new_tag Release"
8282
echo -e "Tagged: ${BOLD_GREEN}$new_tag${OFF}"
8383

8484
# 7. Set 'is_major_release' variable
85-
latest_major_tag=$(expr "$latest_tag" : "$major_tag_regex")
86-
new_major_tag=$(expr "$new_tag" : "$major_tag_regex")
85+
latest_major_release_tag=$(expr "$latest_tag" : "$major_semver_tag_regex")
86+
new_major_release_tag=$(expr "$new_tag" : "$major_semver_tag_regex")
8787

88-
if ! [[ "$new_major_tag" = "$latest_major_tag" ]]; then
88+
if ! [[ "$new_major_release_tag" = "$latest_major_release_tag" ]]; then
8989
is_major_release='yes'
9090
else
9191
is_major_release='no'
9292
fi
9393

9494
# 8. Point separate major release tag (e.g. v1, v2) to the new release
9595
if [ $is_major_release = 'yes' ]; then
96-
# Create a new major verison tag and point to this release
97-
git tag "$new_major_tag" --annotate --message "$new_major_tag Release"
98-
echo -e "New major version tag: ${BOLD_GREEN}$new_major_tag${OFF}"
96+
# Create a new major verison tag and point it to this release
97+
git tag "$new_major_release_tag" --annotate --message "$new_major_release_tag Release"
98+
echo -e "New major version tag: ${BOLD_GREEN}$new_major_release_tag${OFF}"
9999
else
100-
# Update the major verison tag to point to this release
101-
git tag "$latest_major_tag" --force --annotate --message "Sync $latest_major_tag tag with $new_tag"
102-
echo -e "Synced ${BOLD_GREEN}$latest_major_tag${OFF} with ${BOLD_GREEN}$new_tag${OFF}"
100+
# Update the major verison tag to point it to this release
101+
git tag "$latest_major_release_tag" --force --annotate --message "Sync $latest_major_release_tag tag with $new_tag"
102+
echo -e "Synced ${BOLD_GREEN}$latest_major_release_tag${OFF} with ${BOLD_GREEN}$new_tag${OFF}"
103103
fi
104104

105105
# 9. Push the new tags (with commits, if any) to remote
106106
git push --follow-tags
107107

108108
if [ $is_major_release = 'yes' ]; then
109109
# New major version tag is pushed with the '--follow-tags' flags
110-
echo -e "Tags: ${BOLD_GREEN}$new_major_tag${OFF} and ${BOLD_GREEN}$new_tag${OFF} pushed to remote"
110+
echo -e "Tags: ${BOLD_GREEN}$new_major_release_tag${OFF} and ${BOLD_GREEN}$new_tag${OFF} pushed to remote"
111111
else
112112
# Force push the updated major version tag
113-
git push $git_remote "$latest_major_tag" --force
114-
echo -e "Tags: ${BOLD_GREEN}$latest_major_tag${OFF} and ${BOLD_GREEN}$new_tag${OFF} pushed to remote"
113+
git push $git_remote "$latest_major_release_tag" --force
114+
echo -e "Tags: ${BOLD_GREEN}$latest_major_release_tag${OFF} and ${BOLD_GREEN}$new_tag${OFF} pushed to remote"
115115
fi
116116

117-
# 10. If this is a major release, create a 'releases/(latest_major_tag)' branch and push
117+
# 10. If this is a major release, create a 'releases/v#' branch and push
118118
if [ $is_major_release = 'yes' ]; then
119-
git branch "releases/$latest_major_tag" "$latest_major_tag"
120-
echo -e "Branch: ${BOLD_BLUE}releases/$latest_major_tag${OFF} created from ${BOLD_BLUE}$latest_major_tag${OFF} tag"
121-
git push --set-upstream $git_remote "releases/$latest_major_tag"
122-
echo -e "Branch: ${BOLD_GREEN}releases/$latest_major_tag${OFF} pushed to remote"
119+
git branch "releases/$latest_major_release_tag" "$latest_major_release_tag"
120+
echo -e "Branch: ${BOLD_BLUE}releases/$latest_major_release_tag${OFF} created from ${BOLD_BLUE}$latest_major_release_tag${OFF} tag"
121+
git push --set-upstream $git_remote "releases/$latest_major_release_tag"
122+
echo -e "Branch: ${BOLD_GREEN}releases/$latest_major_release_tag${OFF} pushed to remote"
123123
fi
124124

125125
# Completed

0 commit comments

Comments
 (0)