diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-02-28 14:37:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 14:37:36 -0800 |
| commit | 7af3fed654ff1d53abeb9784208e7fd74b2c0bb4 (patch) | |
| tree | 13bdf95daf7aa07abd488c1562270f422884746b | |
| parent | 033ca4b656b9f534130d1d416b224b005aee21fa (diff) | |
| parent | 32d5a5d1e1ec0e98ccae2a56ea66fab4bb9866b9 (diff) | |
| download | chef-7af3fed654ff1d53abeb9784208e7fd74b2c0bb4.tar.gz | |
Merge pull request #6921 from chef/lcg/fix-builds-again-again
fixing red omnibus builds
| -rw-r--r-- | omnibus/Gemfile | 3 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 15 | ||||
| -rw-r--r-- | tasks/dependencies.rb | 4 |
3 files changed, 14 insertions, 8 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 67c6bb4571..0de03a5ea2 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -13,6 +13,9 @@ group :development do # Use Berkshelf for resolving cookbook dependencies gem "berkshelf", "~> 4.0" + # temp pin for chef 14 development + gem "ohai", "~> 13.0" + # Use Test Kitchen with Vagrant for converging the build environment gem "test-kitchen", "~> 1.13" gem "kitchen-vagrant", "~> 0.19.0" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 8a81e35bb7..1c6856f758 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -31,13 +31,13 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-sdk (2.11.6) - aws-sdk-resources (= 2.11.6) - aws-sdk-core (2.11.6) + aws-sdk (2.11.7) + aws-sdk-resources (= 2.11.7) + aws-sdk-core (2.11.7) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.6) - aws-sdk-core (= 2.11.6) + aws-sdk-resources (2.11.7) + aws-sdk-core (= 2.11.7) aws-sigv4 (1.0.2) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -150,8 +150,8 @@ GEM nori (2.6.0) octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (14.0.0) - chef-config (>= 12.5.0.alpha.1, < 15) + ohai (13.7.1) + chef-config (>= 12.5.0.alpha.1, < 14) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress @@ -259,6 +259,7 @@ PLATFORMS DEPENDENCIES berkshelf (~> 4.0) kitchen-vagrant (~> 0.19.0) + ohai (~> 13.0) omnibus! omnibus-software! pedump diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb index 1dba2b4190..a66e166d92 100644 --- a/tasks/dependencies.rb +++ b/tasks/dependencies.rb @@ -1,5 +1,5 @@ # -# Copyright:: Copyright (c) 2016-2017, Chef Software Inc. +# Copyright:: Copyright (c) 2016-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,6 +15,8 @@ # limitations under the License. # +require "bundler" + desc "Tasks to update and check dependencies" namespace :dependencies do |