Implement code from @natefoo comment

https://github.com/galaxyproject/galaxy/issues/715#issuecomment-169148056
This commit is contained in:
Eric Rasche
2016-01-05 17:22:36 -06:00
parent 28cf2822f7
commit cd1cc96d5d
+29
View File
@@ -1,3 +1,5 @@
RELEASE_CURR:=16.01
RELEASE_NEXT:=16.04
GRUNT_DOCKER_NAME:=galaxy/client-builder:16.01
all:
@@ -25,3 +27,30 @@ grunt-docker: grunt-docker-image
clean-grunt-docker-image:
docker rmi ${GRUNT_DOCKER_NAME}
# Release Targets
create_release:
git checkout dev
git pull upstream dev
git push origin dev
git checkout -b release_$(RELEASE_CURR)
git push origin release_$(RELEASE_CURR)
git push upstream release_$(RELEASE_CURR)
git checkout -b version-$(RELEASE_CURR)
sed -i "s/^VERSION_MAJOR = .*/VERSION_MAJOR = \"$(RELEASE_CURR)\"/" lib/galaxy/version.py
git add lib/galaxy/version.py
git commit -m "Update version to $(RELEASE_CURR).rc1"
git checkout dev
git checkout -b version-$(RELEASE_NEXT).dev
sed -i "s/^VERSION_MAJOR = .*/VERSION_MAJOR = \"$(RELEASE_NEXT)\"/" lib/galaxy/version.py
git add lib/galaxy/version.py
git commit -m "Update version to $(RELEASE_NEXT).dev"
git merge version-$(RELEASE_CURR)
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