From a30c74987a1b10fbc5ab7b600e8f8769a34344f7 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 12 Feb 2018 16:38:10 +0000 Subject: brew, diagnostic: tweak CI variable checks. I've adjusted test-bot in: https://github.com/Homebrew/homebrew-test-bot/commit/603918939a58a8d6351177fe35f0193b79549dfa to set CI=1 for Jenkins to make future JENKINS_HOME checks unnecessary. The only `TRAVIS_*` variable we care about is `TRAVIS_SUDO` so whitelist that specifically rather than passing through loads of others. --- Library/Homebrew/diagnostic.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index 8516f2b63..178758347 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -788,7 +788,7 @@ module Homebrew EOS end - return if ENV["CI"] || ENV["JENKINS_HOME"] + return if ENV["CI"] branch = coretap_path.git_branch return if branch.nil? || branch =~ /master/ @@ -838,7 +838,7 @@ module Homebrew def check_for_large_cache return unless HOMEBREW_CACHE.exist? # CI can be expected to have a large cache. - return if ENV["CI"] || ENV["JENKINS_HOME"] + return if ENV["CI"] cache_size = HOMEBREW_CACHE.disk_usage return unless cache_size > 2_147_483_648 <<~EOS -- cgit v1.2.3