diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2019-08-16 01:34:51 +0900 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2019-08-16 01:37:22 +0900 |
| commit | 2f919a92ba45d1174aa72498585ff7025142d9e3 (patch) | |
| tree | 910492e1b5986f083232fe1cd2fca342e5ac8df5 /defs | |
| parent | 789f17665e87ddfe76ef2f7bf344163d7cbf98cf (diff) | |
Improve `make update-github` to avoid configure
after doing it once.
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/gmake.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index 981cb77e15..2436d37bc3 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -190,7 +190,7 @@ checkout-github: fetch-github git -C "$(srcdir)" checkout "gh-$(PR)" .PHONY: update-github -update-github: checkout-github +update-github: fetch-github $(eval PULL_REQUEST_API := https://api.github.com/repos/ruby/ruby/pulls/$(PR)) $(eval PULL_REQUEST_FORK_BRANCH := $(shell \ curl -s $(if $(GITHUB_TOKEN),-H "Authorization: bearer $(GITHUB_TOKEN)") $(PULL_REQUEST_API) | \ @@ -198,10 +198,13 @@ update-github: checkout-github )) $(eval FORK_REPO := $(shell echo $(PULL_REQUEST_FORK_BRANCH) | cut -d' ' -f1)) $(eval PR_BRANCH := $(shell echo $(PULL_REQUEST_FORK_BRANCH) | cut -d' ' -f2)) - git merge master --no-edit - git remote get-url fork-$(PR) || git remote add fork-$(PR) git@github.com:$(FORK_REPO).git - git push fork-$(PR) gh-$(PR):$(PR_BRANCH) - git remote rm fork-$(PR) + + $(eval GITHUB_UPDATE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(PR)-XXXXXX")) + git -C "$(srcdir)" worktree add $(notdir $(GITHUB_UPDATE_WORKTREE)) "gh-$(PR)" + git -C "$(GITHUB_UPDATE_WORKTREE)" merge master --no-edit + @$(BASERUBY) -e 'print "Are you sure to push this to PR=$(PR)? [Y/n]: "; exit(gets.chomp == "n" ? 1 : 0)' + git -C "$(GITHUB_UPDATE_WORKTREE)" remote add fork-$(PR) git@github.com:$(FORK_REPO).git + git -C "$(GITHUB_UPDATE_WORKTREE)" push fork-$(PR) gh-$(PR):$(PR_BRANCH) .PHONY: pull-github pull-github: fetch-github |