diff --git a/Gemfile.lock b/Gemfile.lock index 27d5b4ab4..16529b40a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - shipit-engine (0.43.0) + shipit-engine (0.43.1) active_model_serializers (~> 0.9.3) ansi_stream (~> 0.0.6) autoprefixer-rails (~> 6.4.1) diff --git a/app/models/shipit/deploy_spec/bundler_discovery.rb b/app/models/shipit/deploy_spec/bundler_discovery.rb index c1ede84c6..c3efca4c9 100644 --- a/app/models/shipit/deploy_spec/bundler_discovery.rb +++ b/app/models/shipit/deploy_spec/bundler_discovery.rb @@ -26,11 +26,13 @@ def discover_machine_env end def bundle_install - install_command = %(bundle install --jobs 4 --path #{bundle_path} --retry 2) + path_config_command = %(bundle config set path #{bundle_path}) + install_command = %(bundle install --jobs 4 --retry 2) install_command += " --without=#{bundler_without.join(':')}" unless bundler_without.empty? [ remove_ruby_version_from_gemfile, (bundle_config_frozen if frozen_mode?), + path_config_command, install_command ].compact end diff --git a/lib/shipit/version.rb b/lib/shipit/version.rb index e0531faa6..6c84d716e 100644 --- a/lib/shipit/version.rb +++ b/lib/shipit/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Shipit - VERSION = '0.43.0' + VERSION = '0.43.1' end diff --git a/test/dummy/db/seeds.rb b/test/dummy/db/seeds.rb index cbcd69908..78ee8fb69 100644 --- a/test/dummy/db/seeds.rb +++ b/test/dummy/db/seeds.rb @@ -53,7 +53,7 @@ module Shipit ] }, "override": [ - "bundle check --path=/tmp/bundler || bundle install --frozen --path=/tmp/bundler --retry=2 --without=default:production:development:test:staging:benchmark:debug" + "bundle check --path=/tmp/bundler || bundle config set path /tmp/bundler || bundle config set frozen true || bundle install --retry=2 --without=default:production:development:test:staging:benchmark:debug" ] }, "fetch": [ diff --git a/test/models/deploy_spec_test.rb b/test/models/deploy_spec_test.rb index fec956311..98c4071af 100644 --- a/test/models/deploy_spec_test.rb +++ b/test/models/deploy_spec_test.rb @@ -68,7 +68,6 @@ class DeploySpecTest < ActiveSupport::TestCase command = %( bundle install --jobs 4 - --path #{DeploySpec.bundle_path} --retry 2 --without=default:production:development:test:staging:benchmark:debug ).gsub(/\s+/, ' ').strip @@ -81,7 +80,6 @@ class DeploySpecTest < ActiveSupport::TestCase command = %( bundle install --jobs 4 - --path #{DeploySpec.bundle_path} --retry 2 --without=some:custom:groups ).gsub(/\s+/, ' ').strip