Skip to content

Commit a9889fe

Browse files
honeschneems
andauthored
v247 (#1343)
* v247 * change redis addon to mini for EFP * Disable hatchet run multi The way run multi works is by running multiple `heroku run` commands at the same time. This is much faster than doing them serially. The problem is that one restriction of free Heroku dynes was (key word) that you cannot have more than one dyno running at a time. To get around this limitation, hatchet facilitates scaling dynos up to standard-1 and down back to free, which no longer exists. This is code inside of hatchet that now fails: ```ruby if @run_multi_is_setup @run_multi_array.map(&:join) platform_api.formation.update(name, "web", {"size" => "free"}) end ``` We can avoid this problem in the short term by removing the need to call `run_multi`. Co-authored-by: Richard Schneeman <[email protected]>
1 parent b37eadc commit a9889fe

File tree

5 files changed

+26
-12
lines changed

5 files changed

+26
-12
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Main (unreleased)
44

5+
## v247 (2022/12/01)
6+
7+
* JRuby 9.3.7.0, 9.3.8.0, 9.3.9.0, 9.4.0.0
8+
59
## v246 (2022/11/29)
610

711
* Default Node.js version now 16.18.1 (https://github.com/heroku/heroku-buildpack-ruby/pull/1342)

app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"environments": {
55
"test": {
66
"addons": [
7-
"heroku-redis:hobby-dev"
7+
"heroku-redis:mini"
88
],
99
"env": {
1010
"HATCHET_RETRIES": "3",

changelogs/v247/jruby_releases.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## JRuby versions 9.4.0.0, 9.3.9.0, 9.3.8.0, and 9.3.7.0 are now available
2+
3+
The following Ruby versions are now available on the Heroku platform:
4+
5+
- JRuby 9.4.0.0
6+
- JRuby 9.3.9.0
7+
- JRuby 9.3.8.0
8+
- JRuby 9.3.7.0
9+
10+
You can see the latest versions on the [Ruby support page](https://devcenter.heroku.com/articles/ruby-support).

lib/language_pack/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
module LanguagePack
44
class LanguagePack::Base
5-
BUILDPACK_VERSION = "v246"
5+
BUILDPACK_VERSION = "v247"
66
end
77
end

spec/hatchet/bundler_spec.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
abi_version[-1] = "0" # turn 2.5.7 into 2.5.0
1717
pending("Must enable HATCHET_EXPENSIVE_MODE") unless ENV["HATCHET_EXPENSIVE_MODE"]
1818

19-
Hatchet::Runner.new("default_ruby", run_multi: true, stack: "heroku-18").tap do |app|
19+
Hatchet::Runner.new("default_ruby", stack: "heroku-18").tap do |app|
2020
app.before_deploy do
2121
run!(%Q{echo "ruby '#{ruby_version}'" >> Gemfile})
2222
run!(%Q{printf "\nBUNDLED WITH\n 2.0.1\n" >> Gemfile.lock})
@@ -29,11 +29,11 @@
2929
app.commit!
3030
app.push!
3131

32-
app.run_multi("ls vendor/bundle/ruby/#{abi_version}/gems") do |ls_output|
33-
expect(ls_output).to match("rake-")
34-
end
32+
# app.run_multi("ls vendor/bundle/ruby/#{abi_version}/gems") do |ls_output|
33+
# expect(ls_output).to match("rake-")
34+
# end
3535

36-
app.run_multi("which -a rake") do |which_rake|
36+
app.run("which -a rake") do |which_rake|
3737
expect(which_rake).to include("/app/vendor/bundle/bin/rake")
3838
expect(which_rake).to include("/app/vendor/bundle/ruby/#{abi_version}/bin/rake")
3939
end
@@ -46,19 +46,19 @@
4646
abi_version[-1] = "0" # turn 2.6.6 into 2.6.0
4747
pending("Must enable HATCHET_EXPENSIVE_MODE") unless ENV["HATCHET_EXPENSIVE_MODE"]
4848

49-
Hatchet::Runner.new("default_ruby", run_multi: true).tap do |app|
49+
Hatchet::Runner.new("default_ruby").tap do |app|
5050
app.before_deploy do
5151
run!(%Q{printf "\nBUNDLED WITH\n 1.0.1\n" >> Gemfile.lock})
5252
end
5353
app.deploy do
5454
expect(app.output).to match("Installing dependencies using bundler 1.")
5555
expect(app.output).to match("BUNDLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE=1")
5656

57-
app.run_multi("ls vendor/bundle/ruby/#{abi_version}/gems") do |ls_output|
58-
expect(ls_output).to match("rake-")
59-
end
57+
# app.run_multi("ls vendor/bundle/ruby/#{abi_version}/gems") do |ls_output|
58+
# expect(ls_output).to match("rake-")
59+
# end
6060

61-
app.run_multi("which -a rake") do |which_rake|
61+
app.run("which -a rake") do |which_rake|
6262
expect(which_rake).to include("/app/vendor/bundle/bin/rake")
6363
expect(which_rake).to include("/app/vendor/bundle/ruby/#{abi_version}/bin/rake")
6464
end

0 commit comments

Comments
 (0)