This is an automated email from the ASF dual-hosted git repository. francischuang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git
commit 0640c665a0178b6b1a9ebbd21879d77b2c576c54 Author: Francis Chuang <[email protected]> AuthorDate: Wed May 1 14:05:38 2019 +1000 [CALCITE-3043] Add the ability to publish and promote releases using docker --- docker.sh | 9 ++++++++- site/_docs/howto.md | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/docker.sh b/docker.sh index ba162bc..e1644cb 100755 --- a/docker.sh +++ b/docker.sh @@ -432,10 +432,17 @@ promote_release(){ set_git_credentials + # Tag release and push it git tag rel/avatica-$TAG_WITHOUT_RC $LATEST_TAG - git push $GITBOX_URL rel/avatica-$TAG_WITHOUT_RC + # Merge release branch back to master and push + [[ $TAG_WITHOUT_RC =~ ([[:digit:]]+\.[[:digit:]]+)\.[[:digit:]]+$ ]] + BRANCH_VERSION=${BASH_REMATCH[1]} + git checkout master + git merge branch-$TAG_WITHOUT_RC --ff-only + git push $GITBOX_URL master + svn checkout $RELEASE_REPO /tmp/release rm -rf /tmp/release/$PRODUCT-$TAG_WITHOUT_RC mkdir -p /tmp/release/$PRODUCT-$TAG_WITHOUT_RC diff --git a/site/_docs/howto.md b/site/_docs/howto.md index fad5816..20a955b 100644 --- a/site/_docs/howto.md +++ b/site/_docs/howto.md @@ -568,6 +568,14 @@ svn ci The old releases will remain available in the [release archive](http://archive.apache.org/dist/calcite/). +Merge the release branch back to master and push it: + +{% highlight bash %} +git checkout master +git merge branch-X.Y --ff-only +git push origin master +{% endhighlight %} + ### Publishing a release using docker: This assumes that a rc release was tagged and pushed to the git repository.
