From 0f4e8de62a18a2e1dd9af971ba8582d34620e983 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 3 Aug 2018 07:55:44 +0200 Subject: [PATCH] Remove non-working maintainer check. --- cmd/brewcask-ci.rb | 23 +---------------------- cmd/lib/github.rb | 25 ------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 cmd/lib/github.rb diff --git a/cmd/brewcask-ci.rb b/cmd/brewcask-ci.rb index cbb9762969..6a7788c5b5 100755 --- a/cmd/brewcask-ci.rb +++ b/cmd/brewcask-ci.rb @@ -5,7 +5,6 @@ require "utils/formatter" require_relative "lib/capture" require_relative "lib/diffable" -require_relative "lib/github" require_relative "lib/travis" module Hbc @@ -27,7 +26,7 @@ module Hbc ruby_files_in_wrong_directory.join("\n") end - if modified_cask_files.count > 1 && pr_author && !maintainers.include?(pr_author) + if modified_cask_files.count > 1 && tap.name != "homebrew/cask-fonts" raise CaskError, "More than one cask modified; please submit a pull request for each cask separately." end @@ -200,26 +199,6 @@ module Hbc end end - def pr_author - return unless ENV.key?("TRAVIS_PULL_REQUEST") - return unless ENV.key?("TRAVIS_REPO_SLUG") - - @pr_author ||= begin - owner, repo = ENV["TRAVIS_REPO_SLUG"].split("/", 2) - - pr = GitHub.pull_request(owner, repo, ENV["TRAVIS_PULL_REQUEST"]) - pr.dig("user", "login") - end - end - - def maintainers - @maintainers ||= begin - GitHub.members("Homebrew", team: "cask").map { |member| member.fetch("login") } - rescue GitHub::AuthenticationFailedError - [] - end - end - def modified_files @modified_files ||= system_command!( "git", args: ["diff", "--name-only", "--diff-filter=AMR", ENV["TRAVIS_COMMIT_RANGE"]] diff --git a/cmd/lib/github.rb b/cmd/lib/github.rb deleted file mode 100644 index e2ebc74928..0000000000 --- a/cmd/lib/github.rb +++ /dev/null @@ -1,25 +0,0 @@ -module GitHub - module_function - - ORG_READ_ACCESS_SCOPES = ["read:org"].freeze - - def members(org, team: nil) - if team - url = "#{API_URL}/orgs/#{org}/teams" - teams = open_api(url, scopes: ORG_READ_ACCESS_SCOPES) - - team = teams.detect { |t| t["name"] == team } - - return [] unless team - open_api("#{team["url"]}/members", scopes: ORG_READ_ACCESS_SCOPES) - else - url = "#{API_URL}/orgs/#{org}/members" - open_api(url, scopes: CREATE_ISSUE_FORK_OR_PR_SCOPES) - end - end - - def pull_request(owner, repo, number) - url = "#{API_URL}/repos/#{owner}/#{repo}/pulls/#{number}" - open_api(url) - end -end