mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
John Chilton
eee044aa70
Create new makefile targets for release management. - ``release-create-issue``: Automates creating a release checklist - https://github.com/jmchilton/galaxy/issues/41) Check list contains actual tailored ``make`` commands and links (for PRs and issues). - ``release-check-metadata``: Checks milestone PRs for required metadata needed for generating bootstrapped release notes. ` ``release-bootstrap-history``: Bootstrap release notes from PRs and metadata. - ``release-check-blocking-prs``: Check for PRs blocking release, should happen before branching release and before tagging release. - ``release-check-blocking-issues``: Check for Issues blocking release, should happen before tagging release. (Only allowed issue is the release creation issue.) The issue created with ``release-create-issue`` documents how and when to execute subsequent ``make`` targets (including the target to create the issue for the next release). This PR contains a bunch of other enhancements to the bootstrap_history.py script to enable these targets and renames ``create_release_rc`` Makefile target so all release related targets start with the prefix ``release-``. Conflicts: Makefile
171 lines
6.5 KiB
Makefile
171 lines
6.5 KiB
Makefile
RELEASE_CURR:=16.01
|
|
RELEASE_CURR_MINOR_NEXT:=$(shell expr `awk '$$1 == "VERSION_MINOR" {print $$NF}' lib/galaxy/version.py | tr -d \" | sed 's/None/0/;s/dev/0/;' ` + 1)
|
|
RELEASE_NEXT:=16.04
|
|
# TODO: This needs to be updated with create_release_rc
|
|
#RELEASE_NEXT_BRANCH:=release_$(RELEASE_NEXT)
|
|
RELEASE_NEXT_BRANCH:=dev
|
|
RELEASE_UPSTREAM:=upstream
|
|
# Location of virtualenv used for development.
|
|
VENV?=.venv
|
|
# Source virtualenv to execute command (flake8, sphinx, twine, etc...)
|
|
IN_VENV=if [ -f $(VENV)/bin/activate ]; then . $(VENV)/bin/activate; fi;
|
|
PROJECT_URL?=https://github.com/galaxyproject/galaxy
|
|
GRUNT_DOCKER_NAME:=galaxy/client-builder:16.01
|
|
|
|
all: help
|
|
@echo "This makefile is primarily used for building Galaxy's JS client. A sensible all target is not yet implemented."
|
|
|
|
help:
|
|
@echo "client - rebuild all client artifacts"
|
|
@echo "docs - generate Sphinx HTML documentation, including API docs"
|
|
@echo "open-docs - generate Sphinx HTML documentation and open in browser"
|
|
@echo "open-project - open project on github"
|
|
@echo "lint - check style using tox and flake8 for Python 2 and Python 3"
|
|
@echo "release-check-metadata - check github PR metadata for target release"
|
|
@echo "release-bootstrap-history - bootstrap history for a new release"
|
|
|
|
docs:
|
|
$(IN_VENV) $(MAKE) -C docs clean
|
|
$(IN_VENV) $(MAKE) -C docs html
|
|
|
|
_open-docs:
|
|
open docs/_build/html/index.html || xdg-open docs/_build/html/index.html
|
|
|
|
open-docs: docs _open-docs
|
|
|
|
open-project:
|
|
open $(PROJECT_URL) || xdg-open $(PROJECT_URL)
|
|
|
|
lint:
|
|
$(IN_VENV) tox -e py27-lint && tox -e py34-lint
|
|
|
|
release-issue:
|
|
$(IN_VENV) python scripts/bootstrap_history.py --create-release-issue $(RELEASE_CURR)
|
|
|
|
release-check-metadata:
|
|
$(IN_VENV) python scripts/bootstrap_history.py --check-release $(RELEASE_CURR)
|
|
|
|
release-check-blocking-issues:
|
|
$(IN_VENV) python scripts/bootstrap_history.py --check-blocking-issues $(RELEASE_CURR)
|
|
|
|
release-check-blocking-prs:
|
|
$(IN_VENV) python scripts/bootstrap_history.py --check-blocking-prs $(RELEASE_CURR)
|
|
|
|
release-bootstrap-history:
|
|
$(IN_VENV) python scripts/bootstrap_history.py --release $(RELEASE_CURR)
|
|
|
|
npm-deps:
|
|
cd client && npm install
|
|
|
|
grunt: npm-deps ## Calls out to Grunt to build client
|
|
cd client && node_modules/grunt-cli/bin/grunt
|
|
|
|
style: npm-deps ## Calls the style task of Grunt
|
|
cd client && node_modules/grunt-cli/bin/grunt style
|
|
|
|
webpack: npm-deps ## Pack javascript
|
|
cd client && node_modules/webpack/bin/webpack.js -p
|
|
|
|
client: grunt style webpack ## Process all client-side tasks
|
|
|
|
grunt-docker-image: ## Build docker image for running grunt
|
|
docker build -t ${GRUNT_DOCKER_NAME} client
|
|
|
|
grunt-docker: grunt-docker-image ## Run grunt inside docker
|
|
docker run -it -v `pwd`:/data ${GRUNT_DOCKER_NAME}
|
|
|
|
clean-grunt-docker-image: ## Remove grunt docker image
|
|
docker rmi ${GRUNT_DOCKER_NAME}
|
|
|
|
|
|
# Release Targets
|
|
release-create-rc: ## Create a release-candidate branch
|
|
git checkout dev
|
|
git pull --ff-only ${RELEASE_UPSTREAM} dev
|
|
git push origin dev
|
|
git checkout -b release_$(RELEASE_CURR)
|
|
git push origin 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
|
|
sed -i "s/^VERSION_MINOR = .*/VERSION_MINOR = \"rc1\"/" 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
|
|
git branch -d version-$(RELEASE_CURR)
|
|
git branch -d version-$(RELEASE_NEXT).dev
|
|
|
|
create_release: ## Create a release branch
|
|
git pull --ff-only $(RELEASE_UPSTREAM) master
|
|
git push origin master
|
|
git checkout release_$(RELEASE_CURR)
|
|
git pull --ff-only $(RELEASE_UPSTREAM) release_$(RELEASE_CURR)
|
|
#git push origin 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 merge release_$(RELEASE_CURR)
|
|
git checkout release_$(RELEASE_CURR)
|
|
sed -i "s/^VERSION_MINOR = .*/VERSION_MINOR = None/" lib/galaxy/version.py
|
|
git add lib/galaxy/version.py
|
|
git commit -m "Update version to $(RELEASE_CURR)"
|
|
git tag -m "Tag version $(RELEASE_CURR)" v$(RELEASE_CURR)
|
|
|
|
git checkout dev
|
|
-git merge release_$(RELEASE_CURR)
|
|
git checkout --ours lib/galaxy/version.py
|
|
git add lib/galaxy/version.py
|
|
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
|
|
|
|
create_point_release: ## Create a point release
|
|
git pull --ff-only $(RELEASE_UPSTREAM) master
|
|
git push origin master
|
|
git checkout release_$(RELEASE_CURR)
|
|
git pull --ff-only $(RELEASE_UPSTREAM) release_$(RELEASE_CURR)
|
|
#git push origin release_$(RELEASE_CURR)
|
|
git checkout $(RELEASE_NEXT_BRANCH)
|
|
git pull --ff-only $(RELEASE_UPSTREAM) $(RELEASE_NEXT_BRANCH)
|
|
#git push origin $(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
|
|
git add lib/galaxy/version.py
|
|
git commit -m "Update version to $(RELEASE_CURR).$(RELEASE_CURR_MINOR_NEXT)"
|
|
git tag -m "Tag version $(RELEASE_CURR).$(RELEASE_CURR_MINOR_NEXT)" v$(RELEASE_CURR).$(RELEASE_CURR_MINOR_NEXT)
|
|
git checkout $(RELEASE_NEXT_BRANCH)
|
|
-git merge release_$(RELEASE_CURR)
|
|
git checkout --ours lib/galaxy/version.py
|
|
git add lib/galaxy/version.py
|
|
git commit -m "Merge branch 'release_$(RELEASE_CURR)' into $(RELEASE_NEXT_BRANCH)"
|
|
git checkout master
|
|
git merge release_$(RELEASE_CURR)
|
|
#git push origin release_$(RELEASE_CURR):release_$(RELEASE_CURR)
|
|
#git push origin $(RELEASE_NEXT_BRANCH):release_$(RELEASE_NEXT_BRANCH)
|
|
#git push origin master:master
|
|
#git push origin --tags
|
|
git checkout release_$(RELEASE_CURR)
|
|
|
|
.PHONY: help
|
|
|
|
help:
|
|
@egrep '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
|