diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2021-08-24 12:32:31 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2021-08-24 12:32:31 -0700 |
| commit | 6986e83e9e50588d6176f2fe829c3b9a88571f5a (patch) | |
| tree | 12cea96079c13d363a7efa126447613d733e67ea | |
| parent | 665368406c5da41e2e37ef4ec7473710050dc5e4 (diff) | |
| download | chef-6986e83e9e50588d6176f2fe829c3b9a88571f5a.tar.gz | |
update Gemfile for main
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 14 |
2 files changed, 8 insertions, 10 deletions
@@ -2,7 +2,7 @@ source "https://rubygems.org" gem "chef", path: "." -gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" +gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main" gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__)) gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__)) @@ -48,7 +48,7 @@ end group(:chefstyle) do # for testing new chefstyle rules - gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master" + gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "main" end instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"] diff --git a/Gemfile.lock b/Gemfile.lock index 181082f6e3..991a2f2334 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,15 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: 3ee0e9ee0d9a606c7f15a90e6e2bec3e3d74e073 - branch: master + revision: 55b60964c0fdd289375030d82444fe5dd06ee1b1 + branch: main specs: chefstyle (2.0.8) rubocop (= 1.19.0) GIT remote: https://github.com/chef/ohai.git - revision: 69162f41bd5af837a81a735a7ce091fe4cdfe0f9 - branch: master + revision: de7b4f4349c767120f223b0569687187082ad73c + branch: main specs: ohai (17.3.2) chef-config (>= 14.12, < 18) @@ -322,7 +322,7 @@ GEM rubocop-ast (>= 1.9.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.10.0) + rubocop-ast (1.11.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) @@ -420,11 +420,9 @@ GEM wmi-lite (1.0.5) PLATFORMS - arm64-darwin-20 ruby x64-mingw32 x86-mingw32 - x86_64-linux DEPENDENCIES appbundler @@ -448,4 +446,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.2.22 + 2.2.26 |