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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.17.3 #845

Merged
merged 7 commits into from
Sep 24, 2019
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## v205 (unreleased)

* Update bundler 1.x to 1.17.3 (https://github.com/heroku/heroku-buildpack-ruby/pull/845)
* Default `MALLOC_ARENA_MAX=2` for new applications (https://github.com/heroku/heroku-buildpack-ruby/pull/752)

## v204 (9/12/2019)
Expand Down
3 changes: 3 additions & 0 deletions changelogs/v205/bundler.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Ruby apps with Bundler 1.x now receive version 1.17.3

The [Ruby Buildpack](https://devcenter.heroku.com/articles/ruby-support#libraries) now includes Bundler 1.17.3. Applications specifying Bundler 1.x in their `Gemfile.lock` will now receive bundler: 1.17.3.
3 changes: 1 addition & 2 deletions hatchet.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@
"sharpstone/mri_193_p547",
"sharpstone/ruby_193_jruby_173",
"sharpstone/ruby_193_jruby_176",
"sharpstone/ruby_193_jruby_17161",
"sharpstone/ruby_193_jruby_1_7_27",
"sharpstone/ruby_193_jruby_17161_jdk7",
"sharpstone/ruby_193_jruby_17161_jdk8",
"sharpstone/ruby_193_bad_patch_cedar_14",
"sharpstone/ruby_25",
"sharpstone/jruby-minimal",
Expand Down
6 changes: 2 additions & 4 deletions hatchet.lock
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,13 @@
- 39f4753b620f9ff427c547fd19f04c89f8441f6f
- - "./repos/ruby/ruby_193_bad_patch_cedar_14"
- 6948c1460c596f08c4642d616ae73a45dc0ae51a
- - "./repos/ruby/ruby_193_jruby_17161"
- 130cbe4bc2d8325ecb6d450fb7f5f2248390f0f8
- - "./repos/ruby/ruby_193_jruby_17161_jdk7"
- c1b632f8a96cf9b902f5cdcd7a190d46544a8144
- - "./repos/ruby/ruby_193_jruby_17161_jdk8"
- 01d90df2547488151f3add3b237f15e47e62a4e9
- - "./repos/ruby/ruby_193_jruby_173"
- a08e8b2cc61d08bd611accaa455dbcbfff80f831
- - "./repos/ruby/ruby_193_jruby_176"
- 9fcbc184cb386abc8784e9935d52d403e35c532c
- - "./repos/ruby/ruby_193_jruby_1_7_27"
- 06d5e86180ff0e5b6894f823736cd649dcfebed4
- - "./repos/ruby/ruby_25"
- 0cb3df80d55b61e9417f2ac00adb06e15ae37982
2 changes: 1 addition & 1 deletion lib/language_pack/helpers/bundler_wrapper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class LanguagePack::Helpers::BundlerWrapper
include LanguagePack::ShellHelpers

BLESSED_BUNDLER_VERSIONS = {}
BLESSED_BUNDLER_VERSIONS["1"] = "1.15.2"
BLESSED_BUNDLER_VERSIONS["1"] = "1.17.3"
BLESSED_BUNDLER_VERSIONS["2"] = "2.0.2"
BUNDLED_WITH_REGEX = /^BUNDLED WITH$(\r?\n) (?<major>\d+)\.\d+\.\d+/m

Expand Down
2 changes: 1 addition & 1 deletion spec/hatchet/jvm_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
it "JVM is installed by jvm-common only" do
buildpacks = ["heroku/jvm",
Hatchet::App.default_buildpack] # default is heroku-ruby-buildpack here
app = Hatchet::Runner.new("ruby_193_jruby_17161", stack: 'cedar-14', buildpacks: buildpacks)
app = Hatchet::Runner.new("ruby_193_jruby_1_7_27", stack: 'heroku-18', buildpacks: buildpacks)
app.setup!

app.deploy do |app|
Expand Down
2 changes: 1 addition & 1 deletion spec/hatchet/rubies_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
end

it "should deploy jdk 8 on cedar-14 by default" do
app = Hatchet::Runner.new("ruby_193_jruby_17161", stack: "cedar-14")
app = Hatchet::Runner.new("ruby_193_jruby_1_7_27", stack: "heroku-18")
app.setup!
app.deploy do |app|
expect(app.output).to match("Installing JVM: openjdk-8")
Expand Down