From fff2b231a31f1213d5bc1604ac5e12d8f1e82e57 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 15 Aug 2019 21:26:32 +0900 Subject: Simplified GITHUB_TOKEN argument [ci skip] --- defs/gmake.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'defs/gmake.mk') 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 -- cgit v1.2.3