[前][次][番号順一覧][スレッド一覧]

ruby-changes:57046

From: Nobuyoshi <ko1@a...>
Date: Thu, 15 Aug 2019 21:27:18 +0900 (JST)
Subject: [ruby-changes:57046] Nobuyoshi Nakada: fff2b231a3 (master): Simplified GITHUB_TOKEN argument [ci skip]

https://git.ruby-lang.org/ruby.git/commit/?id=fff2b231a3

From fff2b231a31f1213d5bc1604ac5e12d8f1e82e57 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 15 Aug 2019 21:26:32 +0900
Subject: Simplified GITHUB_TOKEN argument [ci skip]


diff --git a/defs/gmake.mk b/defs/gmake.mk
index e5e837b..798d673 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -190,10 +190,7 @@ checkout-github: fetch-github https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L190
 .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 v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]