Skip to content

Commit

Permalink
Merge pull request #18274 from Homebrew/improve_brew_doctor_prerelease
Browse files Browse the repository at this point in the history
Improve `brew doctor` output on prerelease macOS
  • Loading branch information
MikeMcQuaid authored Sep 6, 2024
2 parents 81f4e4c + dc96184 commit 9978c3d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Library/Homebrew/extend/os/mac/diagnostic.rb
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ def check_for_unsupported_macos
def check_xcode_up_to_date
return unless MacOS::Xcode.outdated?

# avoid duplicate very similar messages
return if MacOS::Xcode.below_minimum_version?

# 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 providers
Expand Down Expand Up @@ -161,6 +164,9 @@ def check_xcode_up_to_date
def check_clt_up_to_date
return unless MacOS::CLT.outdated?

# avoid duplicate very similar messages
return if MacOS::CLT.below_minimum_version?

# 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 providers
Expand Down
7 changes: 7 additions & 0 deletions Library/Homebrew/os/mac/xcode.rb
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,11 @@ def self.installation_instructions
Install the Command Line Tools for Xcode 11.3.1 from:
#{Formatter.url(MacOS::Xcode::APPLE_DEVELOPER_DOWNLOAD_URL)}
EOS
elsif OS::Mac.version.prerelease?
<<~EOS
Install the Command Line Tools for Xcode #{minimum_version.split(".").first} from:
#{Formatter.url(MacOS::Xcode::APPLE_DEVELOPER_DOWNLOAD_URL)}
EOS
else
<<~EOS
Install the Command Line Tools:
Expand All @@ -325,6 +330,8 @@ def self.installation_instructions

sig { returns(String) }
def self.update_instructions
return installation_instructions if OS::Mac.version.prerelease?

software_update_location = if MacOS.version >= "13"
"System Settings"
elsif MacOS.version >= "10.14"
Expand Down

0 comments on commit 9978c3d

Please sign in to comment.