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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade vendored Ruby to 2.3.3. #3164

Merged
merged 1 commit into from Sep 21, 2017
Merged

Upgrade vendored Ruby to 2.3.3. #3164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .travis.yml
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ matrix:
rvm: system
- os: linux
sudo: false
rvm: 2.0.0
rvm: 2.3.3

before_install:
- export HOMEBREW_NO_AUTO_UPDATE=1
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/cmd/vendor-install.sh
View file
Open in desktop
Expand Up @@ -13,8 +13,8 @@ if [[ -n "$HOMEBREW_MACOS" ]]
then
if [[ "$HOMEBREW_PROCESSOR" = "Intel" ]]
then
ruby_URL="https://homebrew.bintray.com/bottles-portable/portable-ruby-2.0.0-p648.leopard_64.bottle.tar.gz"
ruby_SHA="5c1240abe4be91c9774a0089c2a38a8ccfff87c009e8e5786730c659d5e633f7"
ruby_URL="https://homebrew.bintray.com/bottles-portable/portable-ruby-2.3.3.leopard_64.bottle.tar.gz"
ruby_SHA="9060cdddbc5b5a0cc7188a251c40b2845e9d8b8ce346c83c585a965a111cab54"
else
ruby_URL=""
ruby_SHA=""
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/extend/os/mac/diagnostic.rb
View file
Open in desktop
Expand Up @@ -195,8 +195,8 @@ def check_for_other_package_managers
end

def check_ruby_version
ruby_version = "2.0"
return if RUBY_VERSION[/\d\.\d/] == ruby_version
ruby_version = "2.3.3"
return if RUBY_VERSION == ruby_version
return if ARGV.homebrew_developer? && OS::Mac.prerelease?

<<-EOS.undent
Expand Down
9 changes: 4 additions & 5 deletions Library/Homebrew/utils/ruby.sh
View file
Open in desktop
Expand Up @@ -2,7 +2,8 @@ setup-ruby-path() {
local vendor_dir
local vendor_ruby_current_version
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_ruby_current_version="$vendor_dir/portable-ruby/current"
Expand Down Expand Up @@ -36,12 +37,10 @@ setup-ruby-path() {

if [[ -n "$HOMEBREW_RUBY_PATH" ]]
then
ruby_version_major="$("$HOMEBREW_RUBY_PATH" --version)"
ruby_version_major="${ruby_version_major#ruby }"
ruby_version_major="${ruby_version_major%%.*}"
ruby_old_version="$("$HOMEBREW_RUBY_PATH" -e "puts Gem::Version.new('$minimum_ruby_version') > Gem::Version.new(RUBY_VERSION)")"
fi

if [[ "$ruby_version_major" != "2" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]]
if [[ "$ruby_old_version" == "true" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]]
then
brew vendor-install ruby --quiet
if [[ ! -x "$vendor_ruby_path" ]]
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/vendor/portable-ruby-version
View file
Open in desktop
@@ -1 +1 @@
2.0.0-p648
2.3.3