diff options
author | Lamont Granquist <lamont@chef.io> | 2019-07-10 15:40:49 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-10 15:40:49 -0700 |
commit | c6947163e330dd4e83cb56af748dc84bb98f646d (patch) | |
tree | 3459e94ac3f8c8c7f919c8b53a6c81fd05626445 | |
parent | 654356f259320407bb3ce5306c90638dd66d6a98 (diff) | |
parent | 385f1beb75eaff2796ce33cacce8c2ee757ef1e0 (diff) | |
download | chef-c6947163e330dd4e83cb56af748dc84bb98f646d.tar.gz |
Merge pull request #8736 from chef/prevent_double_bundler
Roll back Rubygems to 3.0.3 to prevent double bundler install
-rw-r--r-- | omnibus/Gemfile.lock | 34 | ||||
-rw-r--r-- | omnibus_overrides.rb | 2 |
2 files changed, 18 insertions, 18 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 19242db542..6a4f266c2b 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 5a7c68f463b2b2cf553730ba146d5f512089d501 + revision: d671c6dadb4fe71aa5f547c0587f949a7d246458 branch: master specs: omnibus-software (4.0.0) @@ -32,17 +32,17 @@ GEM public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.178.0) - aws-sdk-core (3.56.0) + aws-partitions (1.187.0) + aws-sdk-core (3.59.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.22.0) - aws-sdk-core (~> 3, >= 3.56.0) + aws-sdk-kms (1.23.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.43.0) - aws-sdk-core (~> 3, >= 3.56.0) + aws-sdk-s3 (1.45.0) + aws-sdk-core (~> 3, >= 3.58.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) @@ -64,11 +64,11 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.3) - chef (15.0.300) + chef (15.1.36) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.0.300) + chef-config (= 15.1.36) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -81,7 +81,7 @@ GEM license-acceptance (~> 1.0, >= 1.0.5) mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (~> 2.1) - mixlib-cli (>= 1.7, < 3.0) + mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 2.4, < 4.0) net-sftp (~> 2.1, >= 2.1.2) @@ -94,11 +94,11 @@ GEM train-core (~> 2.0, >= 2.0.12) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (15.0.300-universal-mingw32) + chef (15.1.36-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.0.300) + chef-config (= 15.1.36) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -112,7 +112,7 @@ GEM license-acceptance (~> 1.0, >= 1.0.5) mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (~> 2.1) - mixlib-cli (>= 1.7, < 3.0) + mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 2.4, < 4.0) net-sftp (~> 2.1, >= 2.1.2) @@ -136,7 +136,7 @@ GEM win32-service (>= 2.1.2, < 3.0) win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) - chef-config (15.0.300) + chef-config (15.1.36) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -154,7 +154,7 @@ GEM concurrent-ruby (1.1.5) diff-lcs (1.3) ed25519 (1.2.4) - equatable (0.6.0) + equatable (0.6.1) erubis (2.7.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) @@ -257,7 +257,7 @@ GEM plist (3.5.0) progressbar (1.10.1) proxifier (1.0.3) - public_suffix (3.1.0) + public_suffix (3.1.1) rack (2.0.7) retryable (3.0.4) ruby-progressbar (1.10.1) @@ -295,7 +295,7 @@ GEM toml-rb (1.1.2) citrus (~> 3.0, > 3.0) tomlrb (1.2.8) - train-core (2.1.7) + train-core (2.1.13) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 3.0) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 7d2a8221c0..91dfffa469 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -4,7 +4,7 @@ # # NOTE: You MUST update omnibus-software when adding new versions of # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock -override :rubygems, version: "3.0.4" +override :rubygems, version: "3.0.3" # rubygems ships its own bundler which may differ from bundler defined below and then we get double bundler which results in performance issues / CLI warnings. Make sure these versions match before bumping either. override :bundler, version: "1.17.2" # currently pinned to what ships in Ruby to prevent double bundler override "nokogiri", version: "1.10.2" override "libffi", version: "3.2.1" |