diff options
| author | John Keiser <john@johnkeiser.com> | 2016-04-17 09:34:29 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-04-18 14:21:02 -0700 |
| commit | 01cf3ef2a85d3190b0bd46835ff6ae37f830764a (patch) | |
| tree | b15fc1934d56c4449101b10d074b72e26a4884e3 /tasks/bundle.rb | |
| parent | 31f9ada8660a2831204aca436e343b6a10b103cd (diff) | |
| download | chef-01cf3ef2a85d3190b0bd46835ff6ae37f830764a.tar.gz | |
Remove Gemfile.windows and put both platforms in Gemfile.lock
Diffstat (limited to 'tasks/bundle.rb')
| -rw-r--r-- | tasks/bundle.rb | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/tasks/bundle.rb b/tasks/bundle.rb index 349f83124c..9de4529d1a 100644 --- a/tasks/bundle.rb +++ b/tasks/bundle.rb @@ -32,13 +32,7 @@ namespace :bundle do puts "-------------------------------------------------------------------" bundle "install #{args}", delete_gemfile_lock: true platforms.each do |platform| - puts "" - puts "-------------------------------------------------------------------" - puts "Updating Gemfile.#{platform}.lock ..." - puts "-------------------------------------------------------------------" - puts "Copy Gemfile.lock to Gemfile.#{platform}.lock ..." - FileUtils.cp(File.join(project_root, "Gemfile.lock"), File.join(project_root, "Gemfile.#{platform}.lock")) - bundle "lock", gemfile: "Gemfile.#{platform}", platform: platform + bundle "lock", platform: platform end end end @@ -54,13 +48,7 @@ namespace :bundle do puts "-------------------------------------------------------------------" bundle "install #{args}" platforms.each do |platform| - puts "" - puts "-------------------------------------------------------------------" - puts "Updating Gemfile.#{platform}.lock (conservatively) ..." - puts "-------------------------------------------------------------------" - puts "Copy Gemfile.lock to Gemfile.#{platform}.lock ..." - FileUtils.cp(File.join(project_root, "Gemfile.lock"), File.join(project_root, "Gemfile.#{platform}.lock")) - bundle "lock", gemfile: "Gemfile.#{platform}", platform: platform + bundle "lock", platform: platform end end end |