diff options
| author | Mike McQuaid | 2017-06-17 17:10:28 +0100 |
|---|---|---|
| committer | GitHub | 2017-06-17 17:10:28 +0100 |
| commit | dd08fe871e0efccaba676f3f01a08b82e02cbbe2 (patch) | |
| tree | e6f992f77554ea058f5600252cf496dcbe1e4d2f | |
| parent | 275aa1d19d20e8473a6327de1f3eb8ff93c030bf (diff) | |
| parent | 370eeed2e4b0a09dd7653716eb74fd5eeec96386 (diff) | |
| download | brew-dd08fe871e0efccaba676f3f01a08b82e02cbbe2.tar.bz2 | |
Merge pull request #2794 from MikeMcQuaid/travis-ci-test-bot-tweaks
travis.yml: tweak how we handle homebrew/test-bot.
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | Library/Homebrew/diagnostic.rb | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 81642a2d6..a5cf08cd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,8 +28,10 @@ before_install: else git fetch --unshallow; export PATH="$PWD/bin:$PATH"; - rm -rf Library/Taps/homebrew/homebrew-test-bot/.git; - mv Library/Taps/homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-core; + HOMEBREW_CORE_TAP_DIR="$(brew --repo "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; fi 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 |