brew, diagnostic: tweak CI variable checks.

I've adjusted test-bot in:
603918939a
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.
This commit is contained in:
Mike McQuaid 2018-02-12 16:38:10 +00:00
parent e904983275
commit a30c74987a
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -66,9 +66,9 @@ then
FILTERED_ENV=()
# Filter all but the specific variables.
for VAR in HOME SHELL PATH TERM LOGNAME USER CI TRAVIS SSH_AUTH_SOCK SUDO_ASKPASS \
for VAR in HOME SHELL PATH TERM LOGNAME USER CI TRAVIS TRAVIS_SUDO SSH_AUTH_SOCK SUDO_ASKPASS \
http_proxy https_proxy ftp_proxy no_proxy all_proxy HTTPS_PROXY FTP_PROXY ALL_PROXY \
"${!HOMEBREW_@}" "${!TRAVIS_@}" "${!JENKINS_@}"
"${!HOMEBREW_@}"
do
# Skip if variable value is empty.
[[ -z "${!VAR}" ]] && continue