Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 3 additions & 1 deletion app/models/shipit/deploy_spec/bundler_discovery.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/shipit/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Shipit
VERSION = '0.43.0'
VERSION = '0.43.1'
end
2 changes: 1 addition & 1 deletion test/dummy/db/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 0 additions & 2 deletions test/models/deploy_spec_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down