Skip to content

Commit

Permalink
Merge pull request #975 from heroku/schneems/absolute-yarn-path
Browse files Browse the repository at this point in the history
Fix yarn relative path in PATH
  • Loading branch information
schneems authored Apr 2, 2020
2 parents 112fa80 + 7cbcd41 commit 0642767
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
## Master (unreleased)

## v214 (4/2/2020)

* Default Ruby version is now 2.6.6 (https://github.com/heroku/heroku-buildpack-ruby/pull/974)
* Fix regression. PATH value for `yarn` at runtime was relative instead of absolute (https://github.com/heroku/heroku-buildpack-ruby/pull/975)

## v213 (4/1/2020)

* Fix regression. PATH value at runtime was relative instead of absolute (https://github.com/heroku/heroku-buildpack-ruby/pull/973)
* Fix regression. PATH value for `ruby` at runtime was relative instead of absolute (https://github.com/heroku/heroku-buildpack-ruby/pull/973)

## v212 (3/26/2020)

Expand Down
2 changes: 1 addition & 1 deletion lib/language_pack/ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ def setup_profiled(ruby_layer_path = "$HOME", gem_layer_path = "$HOME")
instrument 'setup_profiled' do
profiled_path = ["$HOME/bin"]
profiled_path << binstubs_relative_paths(gem_layer_path)
profiled_path << "vendor/#{@yarn_installer.binary_path}" if has_yarn_binary?
profiled_path << "$HOME/vendor/#{@yarn_installer.binary_path}" if has_yarn_binary?
profiled_path << "$PATH"

set_env_default "LANG", "en_US.UTF-8"
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 = "v213"
BUILDPACK_VERSION = "v214"
end
end
4 changes: 3 additions & 1 deletion spec/hatchet/rails5_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ def worker_task_for_app(app)
Hatchet::Runner.new("rails51_webpacker").deploy do |app, heroku|
expect(app.output).to include("Installing yarn")
expect(app.output).to include("yarn install")
expect(app.run("rails -v")).to match("")

expect(app.run("which -a node")).to match("/app/bin/node")
expect(app.run("which -a yarn")).to match("/app/vendor/yarn-")
end
end
end

0 comments on commit 0642767

Please sign in to comment.