aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2017-06-17 14:01:42 +0100
committerMike McQuaid2017-06-17 14:01:42 +0100
commit370eeed2e4b0a09dd7653716eb74fd5eeec96386 (patch)
treee6f992f77554ea058f5600252cf496dcbe1e4d2f
parent17c5304cc0bf0bed6dabf2a2ad241f5fa1e06499 (diff)
downloadbrew-370eeed2e4b0a09dd7653716eb74fd5eeec96386.tar.bz2
diagnostic: quiet some CI whining.
We want to be able to symlink Homebrew/test-bot to Homebrew/core on Linux for CI speed.
-rw-r--r--Library/Homebrew/diagnostic.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index 05e48da21..240e85b48 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -760,6 +760,8 @@ module Homebrew
git -C "#{coretap_path}" remote add origin #{Formatter.url("https://github.com/Homebrew/homebrew-core.git")}
EOS
elsif origin !~ %r{Homebrew/homebrew-core(\.git|/)?$}
+ return if ENV["CI"] && origin.include?("Homebrew/homebrew-test-bot")
+
<<-EOS.undent
Suspicious #{CoreTap.instance} git origin remote found.
@@ -1027,6 +1029,11 @@ module Homebrew
cmd_map.reject! { |_cmd_name, cmd_paths| cmd_paths.size == 1 }
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"
cmd_map.each do |cmd_name, cmd_paths|
message += inject_file_list cmd_paths, <<-EOS.undent