summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2021-01-04 17:14:47 -0800
committerTim Smith <tsmith84@gmail.com>2021-01-04 17:14:47 -0800
commit1d72c964837164b96ba35cf166f08ae9dba881e4 (patch)
tree328b929b66cbe45f8fc0ea32f2bedb164d60e348
parent2398e9cab41feaec9556ee9d160642f5d90acf05 (diff)
downloadchef-bumps_16.tar.gz
Update Ohai to 16.8.2 and pin chefstylebumps_16
This ohai should fix build failures and we don't need to pull chefstyle from git anymore since we only want the latest coming in on chef/chef master. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock30
2 files changed, 13 insertions, 20 deletions
diff --git a/Gemfile b/Gemfile
index acf0d3d5e7..77155db72e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,8 +56,7 @@ group(:development, :test) do
end
group(:chefstyle) do
- # for testing new chefstyle rules
- gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+ gem "chefstyle", "= 1.5.9"
end
instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
diff --git a/Gemfile.lock b/Gemfile.lock
index 642f403622..456f2bd91b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,9 @@
GIT
- remote: https://github.com/chef/chefstyle.git
- revision: 4beb76511e5e3e414bb88942c75f107eb56a9aa1
- branch: master
- specs:
- chefstyle (1.5.7)
- rubocop (= 1.5.2)
-
-GIT
remote: https://github.com/chef/ohai.git
- revision: 1ad8c5946606a7f08ffb841e3682ae2d4991077f
+ revision: 1779bc553112ba6bf44e9ac1a03fe3109f4a3145
branch: 16-stable
specs:
- ohai (16.8.1)
+ ohai (16.8.2)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
@@ -166,6 +158,8 @@ GEM
cheffish (16.0.12)
chef-zero (>= 14.0)
net-ssh
+ chefstyle (1.5.9)
+ rubocop (= 1.7.0)
coderay (1.1.3)
concurrent-ruby (1.1.7)
crack (0.4.4)
@@ -176,7 +170,7 @@ GEM
erubis (2.7.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
- fauxhai-ng (8.6.0)
+ fauxhai-ng (8.7.0)
net-ssh
ffi (1.13.1)
ffi (1.13.1-x64-mingw32)
@@ -270,7 +264,7 @@ GEM
parslet (1.8.2)
pastel (0.8.0)
tty-color (~> 0.5)
- plist (3.5.0)
+ plist (3.6.0)
proxifier (1.0.3)
pry (0.13.1)
coderay (~> 1.1)
@@ -278,15 +272,15 @@ GEM
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
- pry-stack_explorer (0.5.1)
- binding_of_caller (~> 0.7)
+ pry-stack_explorer (0.6.0)
+ binding_of_caller (~> 1.0)
pry (~> 0.13)
public_suffix (4.0.6)
rack (2.2.3)
rainbow (3.0.0)
rake (13.0.1)
rb-readline (0.5.5)
- regexp_parser (2.0.0)
+ regexp_parser (2.0.3)
rexml (3.2.4)
rspec (3.9.0)
rspec-core (~> 3.9.0)
@@ -313,10 +307,10 @@ GEM
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
- rubocop-ast (1.3.0)
+ rubocop-ast (1.4.0)
parser (>= 2.7.1.5)
ruby-prof (1.2.0)
- ruby-progressbar (1.10.1)
+ ruby-progressbar (1.11.0)
ruby-shadow (2.5.0)
rubyntlm (0.6.2)
rubyzip (1.3.0)
@@ -424,7 +418,7 @@ DEPENDENCIES
chef-utils!
chef-vault
cheffish (>= 14)
- chefstyle!
+ chefstyle (= 1.5.9)
fauxhai-ng
inspec-core-bin (~> 4.24)
ohai!