admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

diagnostic: quiet some CI whining.

Browse Source 
We want to be able to symlink Homebrew/test-bot to Homebrew/core on
Linux for CI speed.
This commit is contained in:
Mike McQuaid 2017-06-17 14:01:42 +01:00
parent 17c5304cc0
commit 370eeed2e4
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/diagnostic.rb
View File

@ -760,6 +760,8 @@ module Homebrew
git -C "#{coretap_path}" remote add origin #{Formatter.url("https://github.com/Homebrew/homebrew-core.git")} git -C "#{coretap_path}" remote add origin #{Formatter.url("https://github.com/Homebrew/homebrew-core.git")}
EOS EOS
elsif origin !~ %r{Homebrew/homebrew-core(\.git|/)?$} elsif origin !~ %r{Homebrew/homebrew-core(\.git|/)?$}
return if ENV["CI"] && origin.include?("Homebrew/homebrew-test-bot")
<<-EOS.undent <<-EOS.undent
Suspicious #{CoreTap.instance} git origin remote found. Suspicious #{CoreTap.instance} git origin remote found.
@ -1027,6 +1029,11 @@ module Homebrew
cmd_map.reject! { |_cmd_name, cmd_paths| cmd_paths.size == 1 } cmd_map.reject! { |_cmd_name, cmd_paths| cmd_paths.size == 1 }
return if cmd_map.empty? return if cmd_map.empty?
if ENV["CI"] && cmd_map.keys.length == 1 &&
cmd_map.keys.first == "brew-test-bot"
return
end
message = "You have external commands with conflicting names.\n" message = "You have external commands with conflicting names.\n"
cmd_map.each do |cmd_name, cmd_paths| cmd_map.each do |cmd_name, cmd_paths|
message += inject_file_list cmd_paths, <<-EOS.undent message += inject_file_list cmd_paths, <<-EOS.undent