From 476b5e74246b72c50fc02d7c0b9b6b8ae1291e18 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Tue, 25 Oct 2022 10:55:05 +0100 Subject: [PATCH] os/mac/diagnostic: allow Ruby 2.6.10 on < Ventura --- Library/Homebrew/extend/os/mac/diagnostic.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index d76097a76c..55de9f4bdf 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -205,19 +205,13 @@ module Homebrew end def check_ruby_version - # TODO: update portable-ruby to 2.6.10 when Ventura reaches RC - required_version = if MacOS.version >= :ventura && - ENV["HOMEBREW_RUBY_PATH"].to_s.exclude?("/vendor/portable-ruby/") - "2.6.10" - else - HOMEBREW_REQUIRED_RUBY_VERSION - end - return if RUBY_VERSION == required_version + return if RUBY_VERSION == HOMEBREW_REQUIRED_RUBY_VERSION + return if RUBY_VERSION == "2.6.10" # TODO: require 2.6.10 return if Homebrew::EnvConfig.developer? && OS::Mac.version.prerelease? <<~EOS Ruby version #{RUBY_VERSION} is unsupported on macOS #{MacOS.version}. Homebrew - is developed and tested on Ruby #{required_version}, and may not work correctly + is developed and tested on Ruby #{HOMEBREW_REQUIRED_RUBY_VERSION}, and may not work correctly on other Rubies. Patches are accepted as long as they don't cause breakage on supported Rubies. EOS