diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index 85ce31de16..fa714f68ec 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -130,6 +130,9 @@ module Homebrew 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 @@ -161,6 +164,9 @@ module Homebrew 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 diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 7b23b832c3..1372a03ec6 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -315,6 +315,11 @@ module OS 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: @@ -325,6 +330,8 @@ module OS 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"