Skip to content

Commit

Permalink
Merge pull request #974 from heroku/schneems/default_266
Browse files Browse the repository at this point in the history
Ruby 2.6.6 is the new default
  • Loading branch information
schneems authored Apr 2, 2020
2 parents 51e42ff + 977f318 commit 112fa80
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 14 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
- checkout
- run:
command: |
rvm install 2.6.5
rvm use ruby-2.6.5
export PATH="/opt/circleci/.rvm/rubies/ruby-2.6.5/bin:$PATH"
export GEM_HOME="/opt/circleci/.rvm/gems/ruby-2.6.5"
export GEM_PATH="/opt/circleci/.rvm/gems/ruby-2.6.5"
rvm install 2.6.6
rvm use ruby-2.6.6
export PATH="/opt/circleci/.rvm/rubies/ruby-2.6.6/bin:$PATH"
export GEM_HOME="/opt/circleci/.rvm/gems/ruby-2.6.6"
export GEM_PATH="/opt/circleci/.rvm/gems/ruby-2.6.6"
gem install bundler -v 2.1.0
bundle install
bundle exec rake hatchet:setup_ci
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## Master (unreleased)

* Default Ruby version is now 2.6.6 (https://github.com/heroku/heroku-buildpack-ruby/pull/974)

## v213 (4/1/2020)

* Fix regression. PATH value at runtime was relative instead of absolute (https://github.com/heroku/heroku-buildpack-ruby/pull/973)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'
ruby '2.6.6'

group :development, :test do
gem "toml-rb"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ DEPENDENCIES
toml-rb

RUBY VERSION
ruby 2.6.5p114
ruby 2.6.6p146

BUNDLED WITH
2.0.2
2.1.4
8 changes: 4 additions & 4 deletions buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ api = "0.2"
id = "heroku/ruby"
version = "0.0.1"
name = "Ruby"
ruby_version = "2.6.5"
ruby_version = "2.6.6"

[publish.Ignore]
files = [
Expand All @@ -17,13 +17,13 @@ ruby_version = "2.6.5"
dir = "."
files = ["./.env"]
[[publish.Vendor]]
url = "https://s3-external-1.amazonaws.com/heroku-buildpack-ruby/cedar-14/ruby-2.6.5.tgz"
url = "https://s3-external-1.amazonaws.com/heroku-buildpack-ruby/cedar-14/ruby-2.6.6.tgz"
dir = "vendor/ruby/cedar-14"
[[publish.Vendor]]
url = "https://s3-external-1.amazonaws.com/heroku-buildpack-ruby/heroku-16/ruby-2.6.5.tgz"
url = "https://s3-external-1.amazonaws.com/heroku-buildpack-ruby/heroku-16/ruby-2.6.6.tgz"
dir = "vendor/ruby/heroku-16"
[[publish.Vendor]]
url = "https://s3-external-1.amazonaws.com/heroku-buildpack-ruby/heroku-18/ruby-2.6.5.tgz"
url = "https://s3-external-1.amazonaws.com/heroku-buildpack-ruby/heroku-18/ruby-2.6.6.tgz"
dir = "vendor/ruby/heroku-18"

[[stacks]]
Expand Down
3 changes: 3 additions & 0 deletions changelogs/v213/default_ruby_266.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Default Ruby version for new apps is now 2.6.6

The [default Ruby version for new Ruby applications is 2.6.6](https://devcenter.heroku.com/articles/ruby-support#default-ruby-version-for-new-apps). You’ll only get the default if the application does not specify a ruby version.
2 changes: 1 addition & 1 deletion lib/language_pack/ruby_version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def initialize(output = "")
end
end

DEFAULT_VERSION_NUMBER = "2.6.5"
DEFAULT_VERSION_NUMBER = "2.6.6"
DEFAULT_VERSION = "ruby-#{DEFAULT_VERSION_NUMBER}"
LEGACY_VERSION_NUMBER = "1.9.2"
LEGACY_VERSION = "ruby-#{LEGACY_VERSION_NUMBER}"
Expand Down
2 changes: 1 addition & 1 deletion lib/language_pack/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module LanguagePack
class LanguagePack::Base
BUILDPACK_VERSION = "v212"
BUILDPACK_VERSION = "v213"
end
end

0 comments on commit 112fa80

Please sign in to comment.