|
84 | 84 | echo "$RELEASE_BRANCH branch is ready."
|
85 | 85 |
|
86 | 86 | if [ `git rev-parse --verify $RELEASE_TAG 2>/dev/null` ]; then
|
87 |
| - echo "$RELEASE_TAG tag already exists, aborting ..." |
88 |
| - exit 2 |
89 |
| -fi |
90 |
| - |
91 |
| -${script_dir}/update_sdk_version.sh $REL_VERSION |
92 |
| -git commit -s -m "Release $REL_VERSION" -a |
93 |
| -if [ "$VARIANT" = "" ]; then |
94 |
| - echo "Generating docs ..." |
95 |
| - ${script_dir}/update_docs.sh $REL_VERSION |
96 |
| - git commit -s -m "Generate updated javadocs for $REL_VERSION" -a |
97 |
| -fi |
98 |
| -git push origin $RELEASE_BRANCH |
| 87 | + echo "$RELEASE_TAG tag already exists, checking it out ..." |
| 88 | + git checkout $RELEASE_TAG |
| 89 | +else |
| 90 | + ${script_dir}/update_sdk_version.sh $REL_VERSION |
| 91 | + git commit -s -m "Release $REL_VERSION" -a |
| 92 | + if [ "$VARIANT" = "" ]; then |
| 93 | + echo "Generating docs ..." |
| 94 | + ${script_dir}/update_docs.sh $REL_VERSION |
| 95 | + git commit -s -m "Generate updated javadocs for $REL_VERSION" -a |
| 96 | + fi |
| 97 | + git push origin $RELEASE_BRANCH |
99 | 98 |
|
100 |
| -echo "Tagging $RELEASE_TAG ..." |
101 |
| -git tag $RELEASE_TAG |
102 |
| -echo "$RELEASE_TAG is tagged." |
| 99 | + echo "Tagging $RELEASE_TAG ..." |
| 100 | + git tag $RELEASE_TAG |
| 101 | + echo "$RELEASE_TAG is tagged." |
103 | 102 |
|
104 |
| -echo "Pushing $RELEASE_TAG tag ..." |
105 |
| -git push origin $RELEASE_TAG |
106 |
| -echo "$RELEASE_TAG tag is pushed." |
| 103 | + echo "Pushing $RELEASE_TAG tag ..." |
| 104 | + git push origin $RELEASE_TAG |
| 105 | + echo "$RELEASE_TAG tag is pushed." |
| 106 | +fi |
107 | 107 |
|
108 | 108 | if [ "$VARIANT" = "" ]; then
|
109 | 109 | git clean -xdf
|
|
0 commit comments