admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #12281 from Bo98/ruby-2.6.8

Browse Source 
Portable Ruby 2.6.8
This commit is contained in:
Bo Anderson 2021-10-21 12:06:08 +01:00 committed by GitHub
commit dae07465f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/cmd/vendor-install.sh
View File

@ -16,15 +16,15 @@ if [[ -n "${HOMEBREW_MACOS}" ]]
then then
if [[ "${HOMEBREW_PROCESSOR}" == "Intel" ]] if [[ "${HOMEBREW_PROCESSOR}" == "Intel" ]]
then then
ruby_FILENAME="portable-ruby-2.6.3_2.yosemite.bottle.tar.gz" ruby_FILENAME="portable-ruby-2.6.8.yosemite.bottle.tar.gz"
ruby_SHA="b065e5e3783954f3e65d8d3a6377ca51649bfcfa21b356b0dd70490f74c6bd86" ruby_SHA="0cb1cc7af109437fe0e020c9f3b7b95c3c709b140bde9f991ad2c1433496dd42"
fi fi
elif [[ -n "${HOMEBREW_LINUX}" ]] elif [[ -n "${HOMEBREW_LINUX}" ]]
then then
case "${HOMEBREW_PROCESSOR}" in case "${HOMEBREW_PROCESSOR}" in
x86_64) x86_64)
ruby_FILENAME="portable-ruby-2.6.3_2.x86_64_linux.bottle.tar.gz" ruby_FILENAME="portable-ruby-2.6.8.x86_64_linux.bottle.tar.gz"
ruby_SHA="97e639a64dcec285392b53ad804b5334c324f1d2a8bdc2b5087b8bf8051e332f" ruby_SHA="cd7fffb18ef9338baa670fc5e8fce99b0e3cc0f0fd7627bcbb56f3c8d54161d4"
;; ;;
*) ;; *) ;;
esac esac
@ -45,7 +45,7 @@ then
fi fi
ruby_URLs+=( ruby_URLs+=(
"https://ghcr.io/v2/homebrew/portable-ruby/portable-ruby/blobs/sha256:${ruby_SHA}" "https://ghcr.io/v2/homebrew/portable-ruby/portable-ruby/blobs/sha256:${ruby_SHA}"
"https://github.com/Homebrew/homebrew-portable-ruby/releases/download/2.6.3_2/${ruby_FILENAME}" "https://github.com/Homebrew/homebrew-portable-ruby/releases/download/2.6.8/${ruby_FILENAME}"
) )
ruby_URL="${ruby_URLs[0]}" ruby_URL="${ruby_URLs[0]}"
fi fi

11
Library/Homebrew/extend/os/mac/diagnostic.rb
View File

@ -201,12 +201,19 @@ module Homebrew
end end
def check_ruby_version def check_ruby_version
return if RUBY_VERSION == HOMEBREW_REQUIRED_RUBY_VERSION # TODO: require 2.6.8 for everyone once enough have updated to Monterey
required_version = if MacOS.version >= :monterey ||
ENV["HOMEBREW_RUBY_PATH"].to_s.include?("/vendor/portable-ruby/")
"2.6.8"
else
HOMEBREW_REQUIRED_RUBY_VERSION
end
return if RUBY_VERSION == required_version
return if Homebrew::EnvConfig.developer? && OS::Mac.version.prerelease? return if Homebrew::EnvConfig.developer? && OS::Mac.version.prerelease?
<<~EOS <<~EOS
Ruby version #{RUBY_VERSION} is unsupported on #{MacOS.version}. Homebrew Ruby version #{RUBY_VERSION} is unsupported on #{MacOS.version}. Homebrew
is developed and tested on Ruby #{HOMEBREW_REQUIRED_RUBY_VERSION}, and may not work correctly 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 other Rubies. Patches are accepted as long as they don't cause breakage
on supported Rubies. on supported Rubies.
EOS EOS

2
Library/Homebrew/vendor/portable-ruby-version vendored
View File

@ -1 +1 @@
2.6.3_2 2.6.8