summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-02-15 12:09:45 -0800
committerGitHub <noreply@github.com>2021-02-15 12:09:45 -0800
commit5019d629f73c942cf1066e452359a53faec5797b (patch)
tree24fca08280a6bde0212ece88f6fc3c05e592ee28
parentabb4ef7b8c2c292aa7ce2768e6bc89486f2d0a43 (diff)
parent4674569aec4e2a5218bb49ab98ee8e8e44892e7e (diff)
downloadchef-5019d629f73c942cf1066e452359a53faec5797b.tar.gz
Merge pull request #11045 from chef/hab_fix
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/habitat-test.pipeline.yml1
-rw-r--r--Gemfile.lock8
-rw-r--r--omnibus/Gemfile.lock12
3 files changed, 10 insertions, 11 deletions
diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml
index 22f29162b5..681b80170c 100644
--- a/.expeditor/habitat-test.pipeline.yml
+++ b/.expeditor/habitat-test.pipeline.yml
@@ -39,7 +39,6 @@ steps:
- label: ":habicat: Promoting packages to the current channel."
commands:
- hab pkg promote $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUX current x86_64-linux
- - hab pkg promote $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64LINUXKERNEL2 current x86_64-linux-kernel2
- hab pkg promote $EXPEDITOR_PKG_IDENTS_CHEFINFRACLIENTX86_64WINDOWS current x86_64-windows
expeditor:
executor:
diff --git a/Gemfile.lock b/Gemfile.lock
index e42e2ab507..d37957df08 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 5eb0100dbba7ad54aefff7bab14aabb7ce7a393c
+ revision: 35419f5698c727921170ebdec284d764061ac099
branch: master
specs:
- chefstyle (1.6.2)
- rubocop (= 1.9.1)
+ chefstyle (1.7.1)
+ rubocop (= 1.10.0)
GIT
remote: https://github.com/chef/ohai.git
@@ -310,7 +310,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.2)
- rubocop (1.9.1)
+ rubocop (1.10.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 5201141e33..71e6754072 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: ce5edb7250a9fd82f7bbc79acfddc9e850fc35a7
+ revision: f939485b5c6281500e41d14a1bf21873474248b7
branch: master
specs:
- omnibus (8.0.15)
+ omnibus (8.0.16)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-utils (>= 15.4)
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.426.0)
+ aws-partitions (1.427.0)
aws-sdk-core (3.112.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -41,7 +41,7 @@ GEM
aws-sdk-kms (1.42.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.88.0)
+ aws-sdk-s3 (1.88.1)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@@ -262,9 +262,9 @@ GEM
mixlib-versioning
thor
mixlib-log (3.0.9)
- mixlib-shellout (3.2.2)
+ mixlib-shellout (3.2.5)
chef-utils
- mixlib-shellout (3.2.2-universal-mingw32)
+ mixlib-shellout (3.2.5-universal-mingw32)
chef-utils
ffi-win32-extensions (~> 1.0.3)
win32-process (~> 0.9)