@@ -14,15 +14,15 @@ set -eux
1414# is the beginning of a new release series.
1515
1616if [ -z " $SEMANTIC_VERSION " ; then
17- echo " 'SEMANTIC_VERSION' must be populated."
18- exit 1
17+ echo " 'SEMANTIC_VERSION' must be populated."
18+ exit 1
1919fi
2020
2121if [ -z " $1 " ; then
22- echo " You need to specify the path of the file where you want to collect the output"
23- exit 1
22+ echo " You need to specify the path of the file where you want to collect the output"
23+ exit 1
2424else
25- output_file=" $1 "
25+ output_file=" $1 "
2626fi
2727
2828# Split on the dots
@@ -31,41 +31,50 @@ major=${version_array[0]}
3131minor=${version_array[1]}
3232patch=${version_array[2]}
3333if [[ " ${major} " == " " || " ${minor} " == " " || " ${patch} " == " " ; then
34- echo " '${SEMANTIC_VERSION} ' is not a valid semver tag"
35- exit 1
34+ echo " '${SEMANTIC_VERSION} ' is not a valid semver tag"
35+ exit 1
3636fi
3737if [[ $major == 0 ]]; then
38- branch_name=" smithy-rs-release-${major} .${minor} .x"
39- if [[ $patch == 0 ]]; then
40- echo " new_release_series=true" > " ${output_file} "
41- fi
38+ branch_name=" smithy-rs-release-${major} .${minor} .x"
39+ if [[ $patch == 0 ]]; then
40+ echo " new_release_series=true" > " ${output_file} "
41+ fi
4242else
43- branch_name=" smithy-rs-release-${major} .x.y"
44- if [[ $minor == 0 && $patch == 0 ]]; then
45- echo " new_release_series=true" > " ${output_file} "
46- fi
43+ branch_name=" smithy-rs-release-${major} .x.y"
44+ if [[ $minor == 0 && $patch == 0 ]]; then
45+ echo " new_release_series=true" > " ${output_file} "
46+ fi
4747fi
4848
4949if [[ " ${DRY_RUN} " == " true" ; then
50- branch_name=" ${branch_name} -preview"
50+ branch_name=" ${branch_name} -preview"
5151fi
5252echo " release_branch=${branch_name} " > " ${output_file} "
5353
54- if [[ " ${DRY_RUN} " == " true" ; then
55- git push --force origin " HEAD:refs/heads/${branch_name} "
56- else
57- commit_sha=$( git rev-parse --short HEAD)
58- if ! git ls-remote --exit-code --heads origin " ${branch_name} " ; then
59- # The release branch does not exist.
60- # We need to make sure that the commit SHA that we are releasing is on `main`.
61- git fetch origin main
62- if git branch --contains " ${commit_sha} " | grep main; then
63- # We can then create the release branch and set the current commit as its tip
64- git checkout -b " ${branch_name} "
65- git push origin " ${branch_name} "
66- else
67- echo " You must choose a commit from main to create a new release branch!"
68- exit 1
69- fi
54+ commit_sha=$( git rev-parse --short HEAD)
55+ # the git repo is in a weird state because **main has never been checked out**!
56+ # This prevents the `git branch --contains` from working because there is no _local_ ref for main
57+ git checkout main
58+ git checkout " ${commit_sha} "
59+ if ! git ls-remote --exit-code --heads origin " ${branch_name} " ; then
60+ # The release branch does not exist.
61+ # We need to make sure that the commit SHA that we are releasing is on `main`.
62+ git fetch origin main
63+ echo " Branches: "
64+ git branch --contains " ${commit_sha} "
65+ git show origin/main | head -n 1
66+ if git branch --contains " ${commit_sha} " | grep main; then
67+ # We can then create the release branch and set the current commit as its tip
68+ if [[ " ${DRY_RUN} " == " true" ; then
69+ git push --force origin " HEAD:refs/heads/${branch_name} "
70+ else
71+ git checkout -b " ${branch_name} "
72+ git push origin " ${branch_name} "
7073 fi
74+ else
75+ echo " You must choose a commit from main to create a new release branch!"
76+ exit 1
77+ fi
78+ else
79+ echo " Patch release ${branch_name} already exists"
7180fi
0 commit comments