From 7c4de2009406dbdaa27adee6e0412e013166647c Mon Sep 17 00:00:00 2001 From: Terence Lee Date: Mon, 15 Jan 2018 17:39:06 -0600 Subject: [PATCH 1/2] Stop Bundler from using load to launch an executable in-process in bundle exec. See https://github.com/bundler/bundler/issues/6090. This stops SignalException from being handled by Bundler when using `bundle exec` and instead by Ruby. As of Puma 3.10.0, Puma changed the SIGTERM hanlding to be passed back to the parent process, `bundle exec` in this case. --- lib/language_pack/ruby.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/language_pack/ruby.rb b/lib/language_pack/ruby.rb index 28d6316df..31e383587 100644 --- a/lib/language_pack/ruby.rb +++ b/lib/language_pack/ruby.rb @@ -639,7 +639,9 @@ def build_bundler(default_bundle_without) "RUBYOPT" => syck_hack, "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "true", "JAVA_HOME" => noshellescape("#{pwd}/$JAVA_HOME"), - "BUNDLE_DISABLE_VERSION_CHECK" => "true" + "BUNDLE_DISABLE_VERSION_CHECK" => "true", + # https://github.com/bundler/bundler/issues/6090 + "BUNDLE_DISABLE_EXEC_LOAD" => "true" } env_vars["BUNDLER_LIB_PATH"] = "#{bundler_path}" if ruby_version.ruby_version == "1.8.7" puts "Running: #{bundle_command}" From 805736f79447d6915f672f430ea0586c8d2e8864 Mon Sep 17 00:00:00 2001 From: Terence Lee Date: Mon, 15 Jan 2018 19:21:21 -0600 Subject: [PATCH 2/2] update heroku cli for CircleCI --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index 3119ab852..a5fe0e42a 100644 --- a/circle.yml +++ b/circle.yml @@ -9,6 +9,8 @@ machine: test: pre: + - wget -qO- https://cli-assets.heroku.com/install-ubuntu.sh | sh + - heroku --version - bundle exec rake hatchet:setup_travis override: - bundle exec parallel_rspec -n 11 spec/