From b0939478d17480740bddcbf1a902de128501433d Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Thu, 21 Oct 2021 20:06:34 +0800 Subject: [PATCH 1/2] extend/os/mac/diagnostic: fix unqualified macOS version reference Currently, this says something like Ruby version 2.6.8 is unsupported on 12. which is a little cryptic. Let's change that to say Ruby version 2.6.8 is unsupported on macOS 12. --- Library/Homebrew/extend/os/mac/diagnostic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index 17b19f27fa..5c7c69e4d7 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -212,7 +212,7 @@ module Homebrew return if Homebrew::EnvConfig.developer? && OS::Mac.version.prerelease? <<~EOS - Ruby version #{RUBY_VERSION} is unsupported on #{MacOS.version}. Homebrew + Ruby version #{RUBY_VERSION} is unsupported on macOS #{MacOS.version}. Homebrew is developed and tested on Ruby #{required_version}, and may not work correctly on other Rubies. Patches are accepted as long as they don't cause breakage on supported Rubies. From b040775e16c83aa5784279b48cb1dbed15c5662d Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Thu, 21 Oct 2021 21:05:51 +0800 Subject: [PATCH 2/2] Fix diagnostic_spec The test case needs to be adjusted for the new diagnostic output. --- Library/Homebrew/test/os/mac/diagnostic_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/test/os/mac/diagnostic_spec.rb b/Library/Homebrew/test/os/mac/diagnostic_spec.rb index c0a0e2573e..b51ac02193 100644 --- a/Library/Homebrew/test/os/mac/diagnostic_spec.rb +++ b/Library/Homebrew/test/os/mac/diagnostic_spec.rb @@ -38,7 +38,7 @@ describe Homebrew::Diagnostic::Checks do stub_const("RUBY_VERSION", "1.8.6") expect(checks.check_ruby_version) - .to match "Ruby version 1.8.6 is unsupported on 10.12" + .to match "Ruby version 1.8.6 is unsupported on macOS 10.12" end describe "#check_if_supported_sdk_available" do