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

Merge pull request #2794 from MikeMcQuaid/travis-ci-test-bot-tweaks

Browse Source 
travis.yml: tweak how we handle homebrew/test-bot.
This commit is contained in:
Mike McQuaid 2017-06-17 17:10:28 +01:00 committed by GitHub
commit dd08fe871e
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -28,8 +28,10 @@ before_install:
else else
git fetch --unshallow; git fetch --unshallow;
export PATH="$PWD/bin:$PATH"; export PATH="$PWD/bin:$PATH";
rm -rf Library/Taps/homebrew/homebrew-test-bot/.git; HOMEBREW_CORE_TAP_DIR="$(brew --repo "homebrew/core")";
mv Library/Taps/homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-core; mkdir -p "$HOMEBREW_CORE_TAP_DIR";
HOMEBREW_TEST_BOT_TAP_DIR="$(brew --repo "homebrew/test-bot")";
ln -s "$HOMEBREW_TEST_BOT_TAP_DIR/.git" "$HOMEBREW_TEST_BOT_TAP_DIR/Formula" "$HOMEBREW_CORE_TAP_DIR";
umask 022; umask 022;
fi fi

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