diff --git a/Makefile b/Makefile index b7f7598ca84..789680cfcbd 100644 --- a/Makefile +++ b/Makefile @@ -157,10 +157,10 @@ release-create: release-ensure-upstream ## Create a release branch git commit -m "Merge branch 'release_$(RELEASE_CURR)' into dev" git checkout master git merge release_$(RELEASE_CURR) - #git push $(RELEASE_UPSTREAM) release_$(RELEASE_CURR):release_$(RELEASE_CURR) - #git push $(RELEASE_UPSTREAM) dev:dev - #git push $(RELEASE_UPSTREAM) master:master - #git push $(RELEASE_UPSTREAM) --tags + git push $(RELEASE_UPSTREAM) release_$(RELEASE_CURR):release_$(RELEASE_CURR) + git push $(RELEASE_UPSTREAM) dev:dev + git push $(RELEASE_UPSTREAM) master:master + git push $(RELEASE_UPSTREAM) --tags release-create-point: ## Create a point release git pull --ff-only $(RELEASE_UPSTREAM) master diff --git a/scripts/bootstrap_history.py b/scripts/bootstrap_history.py index dbd4d2e0c16..bc9502ea344 100644 --- a/scripts/bootstrap_history.py +++ b/scripts/bootstrap_history.py @@ -212,10 +212,9 @@ RELEASE_ISSUE_TEMPLATE = string.Template(""" make release-check-blocking-prs RELEASE_CURR=${version} - [ ] Ensure previous release is merged into current. (TODO: Add Makefile target or this.) - - [ ] Create release tag: + - [ ] Create and push release tag: make release-create RELEASE_CURR=${version} - - [ ] Push branches and tags as commented out in Makefile target for ``release-create``. - [ ] **Do Docker Release**