Skip to content

Commit

Permalink
Jumping back to the previous branch after publishing the component
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzo committed Nov 1, 2014
1 parent 164ed14 commit 5b84eed
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Makefile
Expand Up @@ -7,6 +7,7 @@
# is a pre-release
PRERELEASE=$(shell echo $(VERSION) | grep -E 'dev|rc|alpha|beta' --quiet && echo 'true' || echo 'false')
COMPONENTS= log utility cache datasource core collection event validation
CURRENT_BRANCH=$(shell git branch | grep '*' | tr -d '* ')

# Github settings
UPLOAD_HOST=https://uploads.github.com
Expand Down Expand Up @@ -158,12 +159,13 @@ publish: guard-VERSION guard-GITHUB_USER dist/cakephp-$(DASH_VERSION).zip
components: $(foreach component, $(COMPONENTS), component-$(component))

component-%:
git checkout 3.0 > /dev/null
git checkout $(CURRENT_BRANCH) > /dev/null
- (git remote add $* git@github.com:cakephp/$*.git -f 2> /dev/null)
- (git branch -D $* 2> /dev/null)
git checkout -b $*
git filter-branch --prune-empty --subdirectory-filter src/$(shell php -r "echo ucfirst('$*');") -f $*
git push $* $*:master
git checkout $(CURRENT_BRANCH) > /dev/null

# Top level alias for doing a release.
release: guard-VERSION guard-GITHUB_USER tag-release package publish

0 comments on commit 5b84eed

Please sign in to comment.