opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

More clarification of release process.

Browse Source
This commit is contained in:
John Chilton
2016-05-18 08:03:08 -04:00
parent 65c57c5d52
commit 5a8d2a1ad8
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+19 -17
View File
@@ -5,6 +5,7 @@ RELEASE_NEXT:=16.04
#RELEASE_NEXT_BRANCH:=release_$(RELEASE_NEXT)
RELEASE_NEXT_BRANCH:=dev
RELEASE_UPSTREAM:=upstream
MY_UPSTREAM:=origin
# Location of virtualenv used for development.
VENV?=.venv
# Source virtualenv to execute command (flake8, sphinx, twine, etc...)
@@ -79,9 +80,9 @@ clean-grunt-docker-image: ## Remove grunt docker image
release-create-rc: release-ensure-upstream ## Create a release-candidate branch
git checkout dev
git pull --ff-only $(RELEASE_UPSTREAM) dev
git push origin dev
git push $(MY_UPSTREAM) dev
git checkout -b release_$(RELEASE_CURR)
git push origin release_$(RELEASE_CURR)
git push $(MY_UPSTREAM) release_$(RELEASE_CURR)
git push $(RELEASE_UPSTREAM) release_$(RELEASE_CURR)
git checkout -b version-$(RELEASE_CURR)
sed -i "s/^VERSION_MAJOR = .*/VERSION_MAJOR = \"$(RELEASE_CURR)\"/" lib/galaxy/version.py
@@ -99,24 +100,25 @@ release-create-rc: release-ensure-upstream ## Create a release-candidate branch
git checkout --ours lib/galaxy/version.py
git add lib/galaxy/version.py
git commit -m "Merge branch 'version-$(RELEASE_CURR)' into version-$(RELEASE_NEXT).dev"
git push origin version-$(RELEASE_CURR):version-$(RELEASE_CURR)
git push origin version-$(RELEASE_NEXT).dev:version-$(RELEASE_NEXT).dev
git push $(MY_UPSTREAM) version-$(RELEASE_CURR):version-$(RELEASE_CURR)
git push $(MY_UPSTREAM) version-$(RELEASE_NEXT).dev:version-$(RELEASE_NEXT).dev
git branch -d version-$(RELEASE_CURR)
git branch -d version-$(RELEASE_NEXT).dev
# TODO: Use hub to automate these PR creations or push directly.
@echo "Open a PR from version-$(RELEASE_CURR) of your fork to release_$(RELEASE_CURR)"
@echo "Open a PR from version-$(RELEASE_NEXT).dev of your fork to dev"
create_release: release-ensure-upstream ## Create a release branch
release-create: release-ensure-upstream ## Create a release branch
git checkout master
git pull --ff-only $(RELEASE_UPSTREAM) master
git push origin master
git push $(MY_UPSTREAM) master
git checkout release_$(RELEASE_CURR)
git pull --ff-only $(RELEASE_UPSTREAM) release_$(RELEASE_CURR)
#git push origin release_$(RELEASE_CURR)
#git push $(MY_UPSTREAM) release_$(RELEASE_CURR)
git checkout dev
git pull --ff-only $(RELEASE_UPSTREAM) dev
#git push origin dev
# Test run of merging. If there are conflicts, it will fail here here.
#git push $(MY_UPSTREAM) dev
# Test run of merging. If there are conflicts, it will fail here.
git merge release_$(RELEASE_CURR)
git checkout release_$(RELEASE_CURR)
sed -i "s/^VERSION_MINOR = .*/VERSION_MINOR = None/" lib/galaxy/version.py
@@ -131,20 +133,20 @@ create_release: 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 origin release_$(RELEASE_CURR):release_$(RELEASE_CURR)
#git push origin dev:dev
#git push origin master:master
#git push origin --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
create_point_release: ## Create a point release
release-create-point: ## Create a point release
git pull --ff-only $(RELEASE_UPSTREAM) master
git push origin master
git push $(MY_UPSTREAM) master
git checkout release_$(RELEASE_CURR)
git pull --ff-only $(RELEASE_UPSTREAM) release_$(RELEASE_CURR)
#git push origin release_$(RELEASE_CURR)
#git push $(MY_UPSTREAM) release_$(RELEASE_CURR)
git checkout $(RELEASE_NEXT_BRANCH)
git pull --ff-only $(RELEASE_UPSTREAM) $(RELEASE_NEXT_BRANCH)
#git push origin $(RELEASE_NEXT_BRANCH)
#git push $(MY_UPSTREAM) $(RELEASE_NEXT_BRANCH)
git merge release_$(RELEASE_CURR)
git checkout release_$(RELEASE_CURR)
sed -i "s/^VERSION_MINOR = .*/VERSION_MINOR = \"$(RELEASE_CURR_MINOR_NEXT)\"/" lib/galaxy/version.py
scripts/bootstrap_history.py
+5 -1
View File
@@ -205,7 +205,11 @@ RELEASE_ISSUE_TEMPLATE = string.Template("""
- [ ] Ensure all [blocking milestone PRs](https://github.com/galaxyproject/galaxy/pulls?q=is%3Aopen+is%3Apr+milestone%3A${version}) have been merged or closed.
make release-check-blocking-prs RELEASE_CURR=${version}
- [ ] Do release (TODO: create a check a list for this...)
- [ ] Ensure previous release is merged into current. (TODO: Add Makefile target or this.)
- [ ] Create release tag:
make release-create RELEASE_CURR=${version}
- [ ] Push branches and tags as commented out in Makefile target for ``release-create``.
- [ ] **Announce Release**