From 6ac0de1b40699042ea124813f2e953285efbd05f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 17 Feb 2017 21:27:40 +0000 Subject: [PATCH 1/4] Revert "Skip Xcode outdated check on CircleCI" --- Library/Homebrew/extend/os/mac/diagnostic.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index 3e0c1d04d0..6d30cd2946 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -53,8 +53,8 @@ module Homebrew return unless MacOS::Xcode.installed? return unless MacOS::Xcode.outdated? - # CI images are going to end up outdated so don't complain. - return if ENV["TRAVIS"] || ENV["CIRCLECI"] + # Travis CI images are going to end up outdated so don't complain. + return if ENV["TRAVIS"] message = <<-EOS.undent Your Xcode (#{MacOS::Xcode.version}) is outdated. From 3678d60a284cb2ebf1026cf0bb1a9b613f71a734 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 17 Feb 2017 21:53:30 +0000 Subject: [PATCH 2/4] diagnostic: detail TRAVIS opt-out reasoning. --- Library/Homebrew/extend/os/mac/diagnostic.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index 6d30cd2946..229c10e9f8 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -53,7 +53,10 @@ module Homebrew return unless MacOS::Xcode.installed? return unless MacOS::Xcode.outdated? - # Travis CI images are going to end up outdated so don't complain. + # 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 provided + # Homebrew/brew is currently using. return if ENV["TRAVIS"] message = <<-EOS.undent From 398289c72cf9268866b8bb0b706dfeedd7dfee24 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 17 Feb 2017 22:03:04 +0000 Subject: [PATCH 3/4] diagnostic: fix typo. --- Library/Homebrew/extend/os/mac/diagnostic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index 229c10e9f8..4da59bc2f3 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -55,7 +55,7 @@ module Homebrew # 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 provided + # repository. This only needs to support whatever CI provider # Homebrew/brew is currently using. return if ENV["TRAVIS"] From 0c4eb95b9f42b6bf7057254cddd7d7fddde8cd97 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 19 Feb 2017 15:39:52 +0000 Subject: [PATCH 4/4] diagnostic: strip trailing whitespace. --- Library/Homebrew/extend/os/mac/diagnostic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index 4da59bc2f3..c7dabde2b9 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -54,7 +54,7 @@ module Homebrew return unless MacOS::Xcode.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 + # `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"]