From 57ea80ca5db6afb5d226ceb4071b340fd6fc48f4 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Mon, 14 Dec 2015 12:13:18 -0800 Subject: [PATCH] Production releases come from the candidate-$version branch (then get merged into master with a PR afterwards) --- tools/dev-release.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/dev-release.sh b/tools/dev-release.sh index 41e3f9236..76223d123 100755 --- a/tools/dev-release.sh +++ b/tools/dev-release.sh @@ -26,7 +26,7 @@ if [ "$1" = "--production" ] ; then echo Releasing production version "$version"... nextversion="$3" CheckVersion "Next version" "$nextversion" - RELEASE_BRANCH="master" + RELEASE_BRANCH="candidate-$version" else version=`grep "__version__" letsencrypt/__init__.py | cut -d\' -f2 | sed s/\.dev0//` version="$version.dev$(date +%Y%m%d)1" @@ -73,7 +73,7 @@ echo "Cloning into fresh copy at $root" # clean repo = no artificats git clone . $root git rev-parse HEAD cd $root -if [ "$RELEASE_BRANCH" != master ] ; then +if [ "$RELEASE_BRANCH" != "candidate-$version" ] ; then git branch -f "$RELEASE_BRANCH" fi git checkout "$RELEASE_BRANCH" @@ -167,7 +167,7 @@ echo "KGS is at $root/kgs" echo "In order to upload packages run the following command:" echo twine upload "$root/dist.$version/*/*" -if [ "$RELEASE_BRANCH" = master ] ; then +if [ "$RELEASE_BRANCH" = candidate-"$version" ] ; then SetVersion "$nextversion" git diff git commit -m "Bump version to $nextversion"