diff options
| author | Tom Duffield <tom@chef.io> | 2017-02-10 10:40:15 -0600 |
|---|---|---|
| committer | Tom Duffield <tom@chef.io> | 2017-02-10 10:40:15 -0600 |
| commit | 0effec724a428e364b24365f61148ac22f139efe (patch) | |
| tree | 80185c2e83c61a54dc35c735381ba30a4b3b0313 | |
| parent | fdcee2aaa6097bdced840b1739d8f66618e6a564 (diff) | |
| download | chef-0effec724a428e364b24365f61148ac22f139efe.tar.gz | |
Fix some Travis failures related to style and gem depstduffield/un-f-the-world
Signed-off-by: Tom Duffield <tom@chef.io>
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | acceptance/Gemfile.lock | 2 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile | 1 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile.lock | 4 | ||||
| -rw-r--r-- | version_policy.rb | 4 |
5 files changed, 9 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 02819d758b..a7d067732e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/chef-server - revision: 35fecbfa957b7d67eea5c1225377ba7ee85d54c9 + revision: 53b28425d56005a92b0e3bb153f95b505168354a specs: oc-chef-pedant (2.2.0) activesupport (>= 4.2.7.1, < 6.0) @@ -400,7 +400,7 @@ GEM rack (2.0.1) rainbow (2.2.1) rake (11.3.0) - rb-readline (0.5.3) + rb-readline (0.5.4) rest-client (2.0.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index a56a98b91b..8dfb2ec217 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -78,7 +78,7 @@ GEM hashie (3.5.1) hitimes (1.2.4) httpclient (2.8.3) - inspec (1.14.0) + inspec (1.14.1) faraday (>= 0.9.0) hashie (~> 3.4) json (>= 1.8, < 3.0) diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index cfc9b3605e..707a38a7f6 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -1,5 +1,6 @@ source "https://rubygems.org" +gem "rake" # required to build some native extensions gem "berkshelf" gem "kitchen-appbundle-updater" gem "kitchen-dokken", "< 2.0" # 2.x fails atm: https://travis-ci.org/chef/chef/jobs/199125787 diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock index 9430fe7dc4..b9d14397f1 100644 --- a/kitchen-tests/Gemfile.lock +++ b/kitchen-tests/Gemfile.lock @@ -72,7 +72,7 @@ GEM hitimes (1.2.4) hitimes (1.2.4-x86-mingw32) httpclient (2.8.3) - inspec (1.14.0) + inspec (1.14.1) faraday (>= 0.9.0) hashie (~> 3.4) json (>= 1.8, < 3.0) @@ -147,6 +147,7 @@ GEM slop (~> 3.4) public_suffix (2.0.5) rainbow (2.2.1) + rake (12.0.0) retryable (2.0.4) ridley (5.1.0) addressable @@ -249,6 +250,7 @@ DEPENDENCIES kitchen-ec2 kitchen-inspec kitchen-vagrant + rake ridley test-kitchen vagrant-wrapper diff --git a/version_policy.rb b/version_policy.rb index 1253e91344..85c29a760b 100644 --- a/version_policy.rb +++ b/version_policy.rb @@ -82,9 +82,9 @@ ACCEPTABLE_OUTDATED_GEMS = [ "typhoeus", # Until the travis gem updates to 1.0. "cucumber-core", # Until cucumber 2.0 "addressable", # gh (via travis) wants this ~> 2.4.0 - "rake", # poise limits this to < 12 + "rake", # poise limits this to < 12 "github_changelog_generator", # we manage this independent of the rubygem - "cheffish", # 5.0.0 breaks chef-provisioning + "cheffish", # 5.0.0 breaks chef-provisioning "net-ssh-gateway", # chef-provisiong and test-kitchen have ~> 1.2 constraint ] |