mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade vendored Ruby to 2.3.3.

Browse Source 
Use this version whenever 2.3.3 isn't installed. Also, remove the Linux
portable Ruby for now until it's built to be the same version.
This commit is contained in:
Mike McQuaid 2017-09-21 14:27:17 +01:00
parent 2056cd2c90
commit b2b413165f
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -15,7 +15,7 @@ matrix:
rvm: system rvm: system
- os: linux - os: linux
sudo: false sudo: false
rvm: 2.0.0 rvm: 2.3.3
before_install: before_install:
- export HOMEBREW_NO_AUTO_UPDATE=1 - export HOMEBREW_NO_AUTO_UPDATE=1

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

@ -13,8 +13,8 @@ if [[ -n "$HOMEBREW_MACOS" ]]
then then
if [[ "$HOMEBREW_PROCESSOR" = "Intel" ]] if [[ "$HOMEBREW_PROCESSOR" = "Intel" ]]
then then
ruby_URL="https://homebrew.bintray.com/bottles-portable/portable-ruby-2.0.0-p648.leopard_64.bottle.tar.gz" ruby_URL="https://homebrew.bintray.com/bottles-portable/portable-ruby-2.3.3.leopard_64.bottle.tar.gz"
ruby_SHA="5c1240abe4be91c9774a0089c2a38a8ccfff87c009e8e5786730c659d5e633f7" ruby_SHA="9060cdddbc5b5a0cc7188a251c40b2845e9d8b8ce346c83c585a965a111cab54"
else else
ruby_URL="" ruby_URL=""
ruby_SHA="" ruby_SHA=""

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

@ -195,8 +195,8 @@ module Homebrew
end end
def check_ruby_version def check_ruby_version
ruby_version = "2.0" ruby_version = "2.3.3"
return if RUBY_VERSION[/\d\.\d/] == ruby_version return if RUBY_VERSION == ruby_version
return if ARGV.homebrew_developer? && OS::Mac.prerelease? return if ARGV.homebrew_developer? && OS::Mac.prerelease?
<<-EOS.undent <<-EOS.undent

9
Library/Homebrew/utils/ruby.sh
View File

@ -2,7 +2,8 @@ setup-ruby-path() {
local vendor_dir local vendor_dir
local vendor_ruby_current_version local vendor_ruby_current_version
local vendor_ruby_path local vendor_ruby_path
local ruby_version_major local ruby_old_version
local minimum_ruby_version="2.3.3"
vendor_dir="$HOMEBREW_LIBRARY/Homebrew/vendor" vendor_dir="$HOMEBREW_LIBRARY/Homebrew/vendor"
vendor_ruby_current_version="$vendor_dir/portable-ruby/current" vendor_ruby_current_version="$vendor_dir/portable-ruby/current"
@ -36,12 +37,10 @@ setup-ruby-path() {
if [[ -n "$HOMEBREW_RUBY_PATH" ]] if [[ -n "$HOMEBREW_RUBY_PATH" ]]
then then
ruby_version_major="$("$HOMEBREW_RUBY_PATH" --version)" ruby_old_version="$("$HOMEBREW_RUBY_PATH" -e "puts Gem::Version.new('$minimum_ruby_version') > Gem::Version.new(RUBY_VERSION)")"
ruby_version_major="${ruby_version_major#ruby }"
ruby_version_major="${ruby_version_major%%.*}"
fi fi
if [[ "$ruby_version_major" != "2" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]] if [[ "$ruby_old_version" == "true" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]]
then then
brew vendor-install ruby --quiet brew vendor-install ruby --quiet
if [[ ! -x "$vendor_ruby_path" ]] if [[ ! -x "$vendor_ruby_path" ]]

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

@ -1 +1 @@
2.0.0-p648 2.3.3