diff options
| author | Tim Smith <tsmith@chef.io> | 2018-10-05 10:29:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 10:29:16 -0700 |
| commit | 9a8d3fecac8bdbdd1dfcbb113d2068ca904f5f7e (patch) | |
| tree | bb8f68c8000ebd94a597814335cbad07c37b8af5 | |
| parent | afae897c14d9853a178d5acd26db5148394e1560 (diff) | |
| parent | 1e509fe3c883b933ad7feb9744a96abeaa02e307 (diff) | |
| download | chef-9a8d3fecac8bdbdd1dfcbb113d2068ca904f5f7e.tar.gz | |
Merge pull request #7725 from chef/lcg/cleanup-ruby-docs
Add chef-cleanup omnibus-software defn
| -rw-r--r-- | omnibus/Gemfile.lock | 14 | ||||
| -rw-r--r-- | omnibus/config/projects/chef.rb | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 1abb83416f..1359436f7a 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 8773058b6cafc053159bbe24851bc7eeb407d492 + revision: 67a458d2e8a55b267fe0b47f6e1ec9c01e097137 branch: master specs: omnibus-software (4.0.0) @@ -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.137) - aws-sdk-resources (= 2.11.137) - aws-sdk-core (2.11.137) + aws-sdk (2.11.144) + aws-sdk-resources (= 2.11.144) + aws-sdk-core (2.11.144) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.137) - aws-sdk-core (= 2.11.137) + aws-sdk-resources (2.11.144) + aws-sdk-core (= 2.11.144) aws-sigv4 (1.0.3) berkshelf (7.0.6) chef (>= 13.6.52) @@ -174,7 +174,7 @@ GEM kitchen-vagrant (1.3.4) test-kitchen (~> 1.4) libyajl2 (1.2.0) - license_scout (1.0.15) + license_scout (1.0.16) ffi-yajl (~> 2.2) mixlib-shellout (~> 2.2) toml-rb (~> 1.0) diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index 7c90725d95..78301b59b5 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -68,6 +68,8 @@ if windows? dependency "ruby-windows-devkit-bash" end +dependency "chef-cleanup" + package :rpm do signing_passphrase ENV["OMNIBUS_RPM_SIGNING_PASSPHRASE"] compression_level 1 |