diff options
author | tpowell-progress <104777878+tpowell-progress@users.noreply.github.com> | 2022-09-21 09:48:46 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-21 09:48:46 -0400 |
commit | 19856554f2a1a16528ca5ae266ed8c48fc9455be (patch) | |
tree | b83efffdf5abb0e895d7b19e82f576613c48e34f | |
parent | bae9a4b3d37724aab55ff3c4952869fb165ea462 (diff) | |
download | chef-19856554f2a1a16528ca5ae266ed8c48fc9455be.tar.gz |
Remove the chef17 git clone step and (#13197)
Remove the chef17 git clone step that was a temporary debugging step.
Update rest-client sha to latest version vs. a not found version.
Signed-off-by: Thomas Powell <powell@progress.com>
-rw-r--r-- | .github/workflows/kitchen.yml | 2 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index 00e564709f..7296703467 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -211,8 +211,6 @@ jobs: ruby -v echo "Which ruby are we using?" which ruby - sudo mv /home/runner/work/chef/chef /home/runner/work/chef/chef17 - git clone https://github.com/chef/chef.git /home/runner/work/chef/chef cd /home/runner/work/chef/chef bundle install gem install kitchen diff --git a/Dockerfile b/Dockerfile index 0a7459defc..5794ed202c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ FROM busybox LABEL maintainer="Chef Software, Inc. <docker@chef.io>" ARG CHANNEL=stable -ARG VERSION=17.9.26 +ARG VERSION=18.0.146 ARG ARCH=x86_64 ARG PKG_VERSION=6 diff --git a/Gemfile.lock b/Gemfile.lock index e7a8da27ae..c68475dc23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,7 +19,7 @@ GIT GIT remote: https://github.com/chef/rest-client - revision: f3e30a17e5dd826b5f5dce82edcecc52464548e3 + revision: badd0bea3c31a2ed1f49590760d2e4b665ecbce3 branch: jfm/ucrt_update1 specs: rest-client (2.1.0) |