diff options
| author | Tim Smith <tsmith@chef.io> | 2018-10-24 12:24:34 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-10-24 12:24:34 -0700 |
| commit | 86cd7da12264a3e1608b50ef9b22b742434a1907 (patch) | |
| tree | 688bf352005b2b30a33edc82eddddef8e042c36c | |
| parent | a5958cb4961f303c26bf4743619d6461e0ac9f67 (diff) | |
| download | chef-86cd7da12264a3e1608b50ef9b22b742434a1907.tar.gz | |
Switch back to chefstyle from git and use the updated chef omnibus def
Turns out if we switch to non-git chefstyle we just end up with 2 copies and that's not smaller. Keep it as git since everything else pulls it from git. This does pull in the updated definition that should slim our install by about 400k.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 12 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 2 |
3 files changed, 11 insertions, 5 deletions
@@ -52,7 +52,7 @@ group(:development, :test) do gem "webmock" # for testing new chefstyle rules - gem "chefstyle" + gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master" end group(:travis) do diff --git a/Gemfile.lock b/Gemfile.lock index 6677329c96..ad15a3eb58 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/chef/chefstyle.git + revision: 5e596babac0e107170ce7c5cc706646bf609ab25 + branch: master + specs: + chefstyle (0.11.0) + rubocop (= 0.55.0) + PATH remote: . specs: @@ -108,8 +116,6 @@ GEM cheffish (14.0.1) chef-zero (~> 14.0) net-ssh - chefstyle (0.11.0) - rubocop (= 0.55.0) coderay (1.1.2) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -355,7 +361,7 @@ DEPENDENCIES chef-config! chef-vault cheffish (~> 14) - chefstyle + chefstyle! inspec-core (~> 2) netrc octokit diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index c812ec5944..620c5bb3d4 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: ec8df13fa165b7d3866ee61fc05f060283adc642 + revision: 7f8d59bf247140abf02a2bcd3eee0265496f7dcd branch: master specs: omnibus-software (4.0.0) |