diff options
| -rw-r--r-- | acceptance/Gemfile.lock | 10 | ||||
| -rw-r--r-- | acceptance/fips/test/integration/fips/serverspec/Gemfile.lock | 8 | ||||
| -rw-r--r-- | tasks/bundle_util.rb | 4 | ||||
| -rw-r--r-- | tasks/dependencies.rb | 14 |
4 files changed, 11 insertions, 25 deletions
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index 26c93afc17..009c7cee73 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -66,7 +66,7 @@ GEM excon (0.49.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.10-x86-mingw32) + ffi (1.9.10) fuzzyurl (0.8.0) gssapi (1.2.0) ffi (>= 1.0.1) @@ -74,7 +74,6 @@ GEM builder (>= 2.1.2) hashie (3.4.3) hitimes (1.2.3) - hitimes (1.2.3-x86-mingw32) httpclient (2.7.1) inspec (0.19.1) json (~> 1.8) @@ -119,9 +118,6 @@ GEM mixlib-versioning mixlib-log (1.6.0) mixlib-shellout (2.2.6) - mixlib-shellout (2.2.6-universal-mingw32) - win32-process (~> 0.8.2) - wmi-lite (~> 1.0) mixlib-versioning (1.1.0) molinillo (0.4.4) multi_json (1.11.2) @@ -205,8 +201,6 @@ GEM varia_model (0.4.1) buff-extensions (~> 1.0) hashie (>= 2.0.2, < 4.0.0) - win32-process (0.8.3) - ffi (>= 1.0.0) windows_chef_zero (2.0.0) test-kitchen (>= 1.2.1) winrm (1.7.3) @@ -222,11 +216,9 @@ GEM logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) winrm (~> 1.5) - wmi-lite (1.0.0) PLATFORMS ruby - x86-mingw32 DEPENDENCIES berkshelf diff --git a/acceptance/fips/test/integration/fips/serverspec/Gemfile.lock b/acceptance/fips/test/integration/fips/serverspec/Gemfile.lock index bc1bc17377..44714c028b 100644 --- a/acceptance/fips/test/integration/fips/serverspec/Gemfile.lock +++ b/acceptance/fips/test/integration/fips/serverspec/Gemfile.lock @@ -1,18 +1,10 @@ GEM remote: https://rubygems.org/ specs: - ffi (1.9.10-x86-mingw32) mixlib-shellout (2.2.6) - mixlib-shellout (2.2.6-universal-mingw32) - win32-process (~> 0.8.2) - wmi-lite (~> 1.0) - win32-process (0.8.3) - ffi (>= 1.0.0) - wmi-lite (1.0.0) PLATFORMS ruby - x86-mingw32 DEPENDENCIES mixlib-shellout diff --git a/tasks/bundle_util.rb b/tasks/bundle_util.rb index c2f1ca51e3..a057db858a 100644 --- a/tasks/bundle_util.rb +++ b/tasks/bundle_util.rb @@ -25,12 +25,12 @@ module BundleUtil result end - def with_bundle_unfrozen(cwd: nil) + def with_bundle_unfrozen(cwd: nil, leave_frozen: false) bundle "config --delete frozen", cwd: cwd begin yield ensure - bundle "config --local frozen 1", cwd: cwd + bundle "config --local frozen 1", cwd: cwd unless leave_frozen end end diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb index d383ee4433..fc7f11ec4d 100644 --- a/tasks/dependencies.rb +++ b/tasks/dependencies.rb @@ -42,7 +42,7 @@ namespace :dependencies do end end - def gemfile_lock_task(task_name, dirs: []) + def gemfile_lock_task(task_name, dirs: [], other_platforms: true, leave_frozen: true) dirs.each do |dir| desc "Update #{dir}/Gemfile.lock. #{task_name}[conservative] to update as little as possible." task task_name, [:conservative] do |t, rake_args| @@ -52,11 +52,13 @@ namespace :dependencies do puts "-------------------------------------------------------------------" puts "Updating #{dir}/Gemfile.lock#{conservative ? " (conservatively)" : ""} ..." puts "-------------------------------------------------------------------" - with_bundle_unfrozen(cwd: dir) do + with_bundle_unfrozen(cwd: dir, leave_frozen: leave_frozen) do bundle "install", cwd: dir, delete_gemfile_lock: !conservative - # Include all other supported platforms into the lockfile as well - platforms.each do |platform| - bundle "lock", cwd: dir, platform: platform + if other_platforms + # Include all other supported platforms into the lockfile as well + platforms.each do |platform| + bundle "lock", cwd: dir, platform: platform + end end end end @@ -89,7 +91,7 @@ namespace :dependencies do gemfile_lock_task :update_acceptance_gemfile_lock, dirs: %w{ acceptance acceptance/fips/test/integration/fips/serverspec - } + }, other_platforms: false, leave_frozen: false gemfile_lock_task :update_kitchen_tests_gemfile_lock, dirs: %w{ kitchen-tests kitchen-tests/test/integration/webapp/serverspec |