diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-08-15 21:26:32 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-08-15 21:26:51 +0900 |
| commit | fff2b231a31f1213d5bc1604ac5e12d8f1e82e57 (patch) | |
| tree | d636a0b4ebf3a3cb4357fd62a4b05079c7528fcd | |
| parent | 53a55aeff3d409b4894d077f2b3b874fac53e387 (diff) | |
Simplified GITHUB_TOKEN argument [ci skip]
| -rw-r--r-- | defs/gmake.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index e5e837b370..798d673172 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -190,10 +190,7 @@ checkout-github: fetch-github .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 PULL_REQUEST := $(shell curl -s $(if $(GITHUB_TOKEN),-H "Authorization: bearer $(GITHUB_TOKEN)") $(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 |