admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

doctor: Disable cask staging path check when running CI, fix style

Browse Source
This commit is contained in:
William Ma 2020-07-11 11:26:11 -04:00
parent 447ea12d38
commit f4bc2db736
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/diagnostic.rb
View File

@ -882,7 +882,7 @@ module Homebrew
Open3.capture2(csrutil, "status") Open3.capture2(csrutil, "status")
.first .first
.gsub("This is an unsupported configuration, likely to break in " \ .gsub("This is an unsupported configuration, likely to break in " \
"the future and leave your machine in an unknown state.", "") "the future and leave your machine in an unknown state.", "")
.gsub("System Integrity Protection status: ", "") .gsub("System Integrity Protection status: ", "")
.delete("\t\.") .delete("\t\.")
.capitalize .capitalize
@ -896,9 +896,6 @@ module Homebrew
nil nil
end end
# This could be done by calling into Homebrew, but the situation
# where `brew doctor` is needed is precisely the situation where such
# things are less dependable.
def check_cask_install_location def check_cask_install_location
locations = Dir.glob(HOMEBREW_CELLAR.join("brew-cask", "*")).reverse locations = Dir.glob(HOMEBREW_CELLAR.join("brew-cask", "*")).reverse
return if locations.empty? return if locations.empty?
@ -909,6 +906,9 @@ module Homebrew
end end
def check_cask_staging_location def check_cask_staging_location
# Skip this check when running CI since the staging path is not writable for security reasons
return if ENV["HOMEBREW_GITHUB_ACTIONS"]
path = Cask::Caskroom.path path = Cask::Caskroom.path
add_info "Homebrew Cask Staging Location", user_tilde(path.to_s) add_info "Homebrew Cask Staging Location", user_tilde(path.to_s)