diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-02-28 14:13:02 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-28 14:13:02 -0800 |
commit | a8e34a5793904f166beec320e833f93636ad743e (patch) | |
tree | 6300e50ca8e2257e0614c37e53fa7e9ad5070d33 | |
parent | bb3d69736c8b0105ce4d1f60a764b13397d08710 (diff) | |
parent | 2b0ccde00ceaa95178953b3e7f11694a8ad6302f (diff) | |
download | chef-a8e34a5793904f166beec320e833f93636ad743e.tar.gz |
Merge pull request #6917 from chef/tm/bump_deps
bump omnibus deps
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 28 | ||||
-rw-r--r-- | appveyor.yml | 6 | ||||
-rw-r--r-- | omnibus/Gemfile | 4 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 34 | ||||
-rw-r--r-- | omnibus_overrides.rb | 4 |
6 files changed, 37 insertions, 41 deletions
@@ -16,7 +16,7 @@ gem "cheffish", "~> 13" # required for rspec tests group(:omnibus_package) do gem "appbundler" gem "rb-readline" - gem "inspec" + gem "inspec", "~> 1" gem "chef-vault" end diff --git a/Gemfile.lock b/Gemfile.lock index f603e9af8a..15e92fe176 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: 4eb575a63ce5679d9166211d684c9e3fff168d2a + revision: 6177d8b414add867bc89c8bab374f2e39cc717fe branch: master specs: - chefstyle (0.6.0) - rubocop (= 0.49.1) + chefstyle (0.7.0) + rubocop (= 0.52.1) GIT remote: https://github.com/chef/ohai.git @@ -121,8 +121,9 @@ GEM remote: https://rubygems.org/ specs: addressable (2.4.0) - appbundler (0.10.0) + appbundler (0.11.0) mixlib-cli (~> 1.4) + mixlib-shellout (~> 2.0) ast (2.4.0) backports (3.11.1) binding_of_caller (0.8.0) @@ -181,7 +182,7 @@ GEM htmlentities (4.3.4) httpclient (2.8.3) iniparse (1.4.4) - inspec (1.51.18) + inspec (1.51.21) addressable (~> 2.4) faraday (>= 0.9.0) hashie (~> 3.4) @@ -241,9 +242,9 @@ GEM octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) parallel (1.12.1) - parser (2.4.0.2) - ast (~> 2.3) - parslet (1.8.1) + parser (2.5.0.2) + ast (~> 2.4.0) + parslet (1.8.2) plist (3.4.0) powerpack (0.1.1) proxifier (1.0.3) @@ -263,8 +264,7 @@ GEM json websocket (~> 1.0) rack (2.0.4) - rainbow (2.2.2) - rake + rainbow (3.0.0) rake (12.3.0) rb-readline (0.5.5) rspec (3.7.0) @@ -286,11 +286,11 @@ GEM rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.49.1) + rubocop (0.52.1) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) + parser (>= 2.4.0.2, < 3.0) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-prof (0.17.0) @@ -401,7 +401,7 @@ DEPENDENCIES chef-vault cheffish (~> 13) chefstyle! - inspec + inspec (~> 1) netrc octokit ohai! diff --git a/appveyor.yml b/appveyor.yml index dde3bb947e..ddc6009bf8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,12 +25,6 @@ install: - winrm quickconfig -q - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - echo %PATH% - - ps: $env:OMNIBUS_RUBYGEMS=$(findstr rubygems omnibus_overrides.rb | %{ $_.split(" ")[3] }) - - echo %OMNIBUS_RUBYGEMS% - - ps: $env:OMNIBUS_BUNDLER=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] }) - - echo %OMNIBUS_BUNDLER% - - gem --version - - gem update --system %OMNIBUS_RUBYGEMS% || gem update --system %OMNIBUS_RUBYGEMS% || gem update --system %OMNIBUS_RUBYGEMS% - appveyor DownloadFile http://curl.haxx.se/ca/cacert.pem -FileName C:\cacert.pem - set SSL_CERT_FILE=C:\cacert.pem - SET BUNDLE_WITHOUT=server:docgen:maintenance:pry:travis:integration:ci diff --git a/omnibus/Gemfile b/omnibus/Gemfile index dbf7409032..67c6bb4571 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "omnibus", git: "https://github.com/chef/omnibus" -gem "omnibus-software", git: "https://github.com/chef/omnibus-software" +gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master" +gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master" gem "pedump" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index a36078d763..8a81e35bb7 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,8 +1,9 @@ GIT remote: https://github.com/chef/omnibus - revision: 63e908114e460d47609869ece898c45d7250247b + revision: 9a3a97bb0c6b437524fdea15b4cd15a65ff6ac29 + branch: master specs: - omnibus (5.6.9) + omnibus (5.6.10) aws-sdk (~> 2) chef-sugar (~> 3.3) cleanroom (~> 1.0) @@ -10,14 +11,15 @@ GIT license_scout (~> 1.0) mixlib-shellout (~> 2.0) mixlib-versioning - ohai (~> 8.0) + ohai (>= 8.6.0.alpha.1, < 15) pedump ruby-progressbar (~> 1.7) thor (~> 0.18) GIT remote: https://github.com/chef/omnibus-software - revision: 4ef2d1a5b9162f4f5f52617d2a0122796b4f3c43 + revision: f0c34cd3a21c4da6207721914213ac775b44570f + branch: master specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -29,13 +31,13 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-sdk (2.10.129) - aws-sdk-resources (= 2.10.129) - aws-sdk-core (2.10.129) + aws-sdk (2.11.6) + aws-sdk-resources (= 2.11.6) + aws-sdk-core (2.11.6) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.10.129) - aws-sdk-core (= 2.10.129) + aws-sdk-resources (2.11.6) + aws-sdk-core (= 2.11.6) aws-sigv4 (1.0.2) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -76,7 +78,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (13.7.16) + chef-config (13.8.0) addressable fuzzyurl mixlib-config (~> 2.0) @@ -90,9 +92,9 @@ GEM erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.21) - ffi (1.9.21-x64-mingw32) - ffi (1.9.21-x86-mingw32) + ffi (1.9.23) + ffi (1.9.23-x64-mingw32) + ffi (1.9.23-x86-mingw32) ffi-yajl (2.3.1) libyajl2 (~> 1.2) fuzzyurl (0.9.0) @@ -111,7 +113,7 @@ GEM kitchen-vagrant (0.19.0) test-kitchen (~> 1.4) libyajl2 (1.2.0) - license_scout (1.0.0) + license_scout (1.0.1) ffi-yajl (~> 2.2) mixlib-shellout (~> 2.2) toml-rb (~> 1.0) @@ -148,8 +150,8 @@ GEM nori (2.6.0) octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (8.26.1) - chef-config (>= 12.5.0.alpha.1, < 14) + ohai (14.0.0) + chef-config (>= 12.5.0.alpha.1, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index e40a322775..51c5df4a01 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -1,8 +1,8 @@ # THIS IS NOW HAND MANAGED, JUST EDIT THE THING # .travis.yml and appveyor.yml consume this, # try to keep it machine-parsable. -override :rubygems, version: "2.6.14" -override :bundler, version: "1.15.4" +override :rubygems, version: "2.7.6" +override :bundler, version: "1.16.1" override "nokogiri", version: "1.8.1" override "libffi", version: "3.2.1" override "libiconv", version: "1.15" |