kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Add make update-github PR=1234 to refresh PR (#2368)

Browse source
This commit is contained in:
Takashi Kokubun 2019-08-15 01:00:26 +09:00 • committed by GitHub
parent e173012f44
commit 938e075273
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
Notes: git 2019-08-31 04:40:14 +09:00 
Merged-By: k0kubun <takashikkbn@gmail.com>
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
defs/gmake.mk
View file

@ -187,6 +187,20 @@ endef
checkout-github: fetch-github checkout-github: fetch-github
git -C "$(srcdir)" checkout "gh-$(PR)" git -C "$(srcdir)" checkout "gh-$(PR)"
.PHONY: update-github
update-github: checkout-github
$(eval PULL_REQUEST_API := https://api.github.com/repos/ruby/ruby/pulls/$(PR))
$(if $(GITHUB_TOKEN), \
$(eval PULL_REQUEST := $(shell curl -s -H "Authorization: bearer $$GITHUB_TOKEN" $(PULL_REQUEST_API))), \
$(eval PULL_REQUEST := $(shell curl -s $(PULL_REQUEST_API))) \
)
$(eval FORK_REPO := $(shell $(BASERUBY) -rjson -e 'print JSON.parse(ARGV[0]).dig("head", "repo", "full_name")' '$(PULL_REQUEST)'))
$(eval PR_BRANCH := $(shell $(BASERUBY) -rjson -e 'print JSON.parse(ARGV[0]).dig("head", "ref")' '$(PULL_REQUEST)'))
git merge master --no-edit
git remote add fork-$(PR) git@github.com:$(FORK_REPO).git
git push fork-$(PR) gh-$(PR):$(PR_BRANCH)
git remote rm fork-$(PR)
.PHONY: pull-github .PHONY: pull-github
pull-github: fetch-github pull-github: fetch-github
$(call pull-github,$(PR)) $(call pull-github,$(PR))
@ -219,6 +233,7 @@ pr-% pull-github-%: fetch-github-%
HELP_EXTRA_TASKS = \ HELP_EXTRA_TASKS = \
" checkout-github: checkout GitHub Pull Request [PR=1234]" \ " checkout-github: checkout GitHub Pull Request [PR=1234]" \
" pull-github: rebase GitHub Pull Request to new worktree [PR=1234]" \ " pull-github: rebase GitHub Pull Request to new worktree [PR=1234]" \
" update-github: merge master branch and push it to Pull Request [PR=1234]" \
"" ""
ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2) ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)