From 60f6dfea14c9f5a070334c6341b2a39c9bdc4163 Mon Sep 17 00:00:00 2001
From: EricFromCanada
Date: Tue, 28 Mar 2017 11:12:34 -0400
Subject: update suggested Xcode/CLT download URLs

---
 Library/Homebrew/extend/os/mac/development_tools.rb | 4 ++--
 Library/Homebrew/extend/os/mac/missing_formula.rb   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Library/Homebrew/extend')

diff --git a/Library/Homebrew/extend/os/mac/development_tools.rb b/Library/Homebrew/extend/os/mac/development_tools.rb
index f54c6b8a3..caa85ffca 100644
--- a/Library/Homebrew/extend/os/mac/development_tools.rb
+++ b/Library/Homebrew/extend/os/mac/development_tools.rb
@@ -31,13 +31,13 @@ class DevelopmentTools
       elsif MacOS.version == "10.8" || MacOS.version == "10.7"
         <<-EOS.undent
           Install the Command Line Tools from
-            https://developer.apple.com/downloads/
+            https://developer.apple.com/download/more/
           or via Xcode's preferences.
         EOS
       else
         <<-EOS.undent
           Install Xcode from
-            https://developer.apple.com/xcode/downloads/
+            https://developer.apple.com/download/more/
         EOS
       end
     end
diff --git a/Library/Homebrew/extend/os/mac/missing_formula.rb b/Library/Homebrew/extend/os/mac/missing_formula.rb
index 48dfd2865..bcf0eb25d 100644
--- a/Library/Homebrew/extend/os/mac/missing_formula.rb
+++ b/Library/Homebrew/extend/os/mac/missing_formula.rb
@@ -10,7 +10,7 @@ module Homebrew
             EOS
           else
             <<-EOS.undent
-            Xcode can be installed from #{Formatter.url("https://developer.apple.com/xcode/downloads/")}.
+            Xcode can be installed from #{Formatter.url("https://developer.apple.com/download/more/")}.
             EOS
           end
         else
-- 
cgit v1.2.3


From a084776f95d6bb94985cc6f74757b40e4e4ba57b Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Sun, 2 Apr 2017 17:24:33 +0100
Subject: diagnostic: also ignore outdated CLT on Travis CI.

---
 Library/Homebrew/extend/os/mac/diagnostic.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Library/Homebrew/extend')

diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index c7dabde2b..fb6b30836 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -81,6 +81,12 @@ module Homebrew
         return unless MacOS::CLT.installed?
         return unless MacOS::CLT.outdated?
 
+        # Travis CI images are going to end up outdated so don't complain when
+        # `brew test-bot` runs `brew doctor` in the CI for the Homebrew/brew
+        # repository. This only needs to support whatever CI provider
+        # Homebrew/brew is currently using.
+        return if ENV["TRAVIS"]
+
         <<-EOS.undent
           A newer Command Line Tools release is available.
           #{MacOS::CLT.update_instructions}
-- 
cgit v1.2.3