Merge pull request #2857 from jmchilton/release_process_tweaks

Automate more of the release process...
This commit is contained in:
Martin Cech
2016-08-25 14:04:49 -04:00
committed by GitHub
2 changed files with 5 additions and 6 deletions
+4 -4
View File
@@ -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
+1 -2
View File
@@ -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**