Skip to content

Commit c065465

Browse files
authored
Merge pull request #994 from actions/ncalteen/release
Fix error during initial release script run
2 parents e29f035 + cafe8ed commit c065465

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

script/release

+14-7
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,20 @@ 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_release_tag=$(expr "$latest_tag" : "$major_semver_tag_regex")
8685
new_major_release_tag=$(expr "$new_tag" : "$major_semver_tag_regex")
8786

88-
if ! [[ "$new_major_release_tag" = "$latest_major_release_tag" ]]; then
87+
if [[ "$latest_tag" = "[unknown]" ]]; then
88+
# This is the first major release
8989
is_major_release='yes'
9090
else
91-
is_major_release='no'
91+
# Compare the major version of the latest tag with the new tag
92+
latest_major_release_tag=$(expr "$latest_tag" : "$major_semver_tag_regex")
93+
94+
if ! [[ "$new_major_release_tag" = "$latest_major_release_tag" ]]; then
95+
is_major_release='yes'
96+
else
97+
is_major_release='no'
98+
fi
9299
fi
93100

94101
# 8. Point separate major release tag (e.g. v1, v2) to the new release
@@ -116,10 +123,10 @@ fi
116123

117124
# 10. If this is a major release, create a 'releases/v#' branch and push
118125
if [ $is_major_release = 'yes' ]; then
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"
126+
git branch "releases/$new_major_release_tag" "$new_major_release_tag"
127+
echo -e "Branch: ${BOLD_BLUE}releases/$new_major_release_tag${OFF} created from ${BOLD_BLUE}$new_major_release_tag${OFF} tag"
128+
git push --set-upstream $git_remote "releases/$new_major_release_tag"
129+
echo -e "Branch: ${BOLD_GREEN}releases/$new_major_release_tag${OFF} pushed to remote"
123130
fi
124131

125132
# Completed

0 commit comments

Comments
 (0)