Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Portable Ruby 2.6.10_1 #15204

Merged
merged 2 commits into from Apr 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Library/Homebrew/Gemfile.lock
Expand Up @@ -266,7 +266,7 @@ DEPENDENCIES
warning

RUBY VERSION
ruby 2.6.8p205
ruby 2.6.10p210

BUNDLED WITH
2.3.26
2 changes: 1 addition & 1 deletion Library/Homebrew/brew.sh
Expand Up @@ -540,7 +540,7 @@ then

# Set a variable when the macOS system Ruby is new enough to avoid spawning
# a Ruby process unnecessarily.
if [[ "${HOMEBREW_MACOS_VERSION_NUMERIC}" -lt "120000" ]]
if [[ "${HOMEBREW_MACOS_VERSION_NUMERIC}" -lt "120601" ]]
then
unset HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH
else
Expand Down
14 changes: 7 additions & 7 deletions Library/Homebrew/cmd/vendor-install.sh
Expand Up @@ -20,19 +20,19 @@ then
# use a x86_64 Portable Ruby.
[[ "${HOMEBREW_PHYSICAL_PROCESSOR}" == "arm64" && "${HOMEBREW_PREFIX}" == "/usr/local" ]]
then
ruby_FILENAME="portable-ruby-2.6.8_1.el_capitan.bottle.tar.gz"
ruby_SHA="1f50bf80583bd436c9542d4fa5ad47df0ef0f0bea22ae710c4f04c42d7560bca"
ruby_FILENAME="portable-ruby-2.6.10_1.el_capitan.bottle.tar.gz"
ruby_SHA="61029cec31c68a1fae1fa90fa876adf43d0becff777da793f9b5c5577f00567a"
elif [[ "${HOMEBREW_PHYSICAL_PROCESSOR}" == "arm64" ]]
then
ruby_FILENAME="portable-ruby-2.6.8_1.arm64_big_sur.bottle.tar.gz"
ruby_SHA="cf9137b1da5568d4949f71161a69b101f60ddb765e94d2b423c9801b67a1cb43"
ruby_FILENAME="portable-ruby-2.6.10_1.arm64_big_sur.bottle.tar.gz"
ruby_SHA="905b0c3896164ae8067a22fff2fd0b80b16d3c8bb72441403eedf69da71ec717"
fi
elif [[ -n "${HOMEBREW_LINUX}" ]]
then
case "${HOMEBREW_PROCESSOR}" in
x86_64)
ruby_FILENAME="portable-ruby-2.6.8_1.x86_64_linux.bottle.tar.gz"
ruby_SHA="fc45ee6eddf4c7a17f4373dde7b1bc8a58255ea61e6847d3bf895225b28d072a"
ruby_FILENAME="portable-ruby-2.6.10_1.x86_64_linux.bottle.tar.gz"
ruby_SHA="68923daf3e139482b977c3deba63a3b54ea37bb5f716482948878819ef911bad"
;;
*) ;;
esac
Expand All @@ -53,7 +53,7 @@ then
fi
ruby_URLs+=(
"https://ghcr.io/v2/homebrew/portable-ruby/portable-ruby/blobs/sha256:${ruby_SHA}"
"https://github.com/Homebrew/homebrew-portable-ruby/releases/download/2.6.8_1/${ruby_FILENAME}"
"https://github.com/Homebrew/homebrew-portable-ruby/releases/download/2.6.10_1/${ruby_FILENAME}"
)
ruby_URL="${ruby_URLs[0]}"
fi
Expand Down
1 change: 0 additions & 1 deletion Library/Homebrew/extend/os/mac/diagnostic.rb
Expand Up @@ -206,7 +206,6 @@ def check_if_xcode_needs_clt_installed

def check_ruby_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
Expand Down
4 changes: 3 additions & 1 deletion Library/Homebrew/utils/ruby.sh
@@ -1,4 +1,6 @@
export HOMEBREW_REQUIRED_RUBY_VERSION=2.6.8
# When bumping, run `brew vendor-gems --update=--ruby`
# When bumping to a new major/minor version, also update the bounds in the Gemfile
export HOMEBREW_REQUIRED_RUBY_VERSION=2.6.10

# HOMEBREW_LIBRARY is from the user environment
# shellcheck disable=SC2154
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/vendor/portable-ruby-version
@@ -1 +1 @@
2.6.8_1
2.6.10_1