summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2022-07-27 11:38:55 -0700
committerJohn McCrae <john.mccrae@progress.com>2022-08-03 09:06:38 -0700
commitd7ef76854ebaff4bd222fcad4e411b0cf625ff34 (patch)
tree13ba0e4481135eb9e1f3cbaef9682ce5fcc3cfab
parentcda2023f6b8f7de267668a108d2c3ecba27d3afd (diff)
downloadchef-d7ef76854ebaff4bd222fcad4e411b0cf625ff34.tar.gz
starting to integrate ruby 3.1 into the builds
Signed-off-by: John McCrae <john.mccrae@progress.com>
-rw-r--r--.github/workflows/kitchen.yml22
1 files changed, 12 insertions, 10 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 12301ef762..dc0ec9be84 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -161,11 +161,12 @@ jobs:
echo 'eval "$(rbenv init - zsh)"' >> ~/.zshrc
source ~/.zshrc
rbenv install 3.1.2
+ rbenv global 3.1.2-p20
# echo "which gem file are we using now?"
# which gem
- # OHAI_VERSION=$(sed -n '/ohai .[0-9]/{s/.*(//;s/)//;p;}' Gemfile.lock)
- # sudo /opt/chef/embedded/bin/gem install appbundler appbundle-updater --no-doc
- # sudo /opt/chef/embedded/bin/appbundle-updater chef chef $GITHUB_SHA --tarball --github $GITHUB_REPOSITORY
+ OHAI_VERSION=$(sed -n '/ohai .[0-9]/{s/.*(//;s/)//;p;}' Gemfile.lock)
+ sudo /opt/chef/embedded/bin/gem install appbundler appbundle-updater --no-doc
+ sudo /opt/chef/embedded/bin/appbundle-updater chef chef $GITHUB_SHA --tarball --github $GITHUB_REPOSITORY
# echo "Installed Chef / Ohai release:"
# /opt/chef/bin/chef-client -v
# /opt/chef/bin/ohai -v
@@ -173,13 +174,13 @@ jobs:
id: run
run: |
cd kitchen-tests
- # sudo /opt/chef/embedded/bin/bundle config set --local without 'omnibus_package'
- # sudo /opt/chef/embedded/bin/bundle config set --local path 'vendor/bundle'
- # sudo /opt/chef/embedded/bin/bundle install --jobs=3 --retry=3
- # sudo rm -f /opt/chef/embedded/bin/{htmldiff,ldiff}
- # sudo /opt/chef/embedded/bin/gem install berkshelf --no-doc
- # sudo /opt/chef/embedded/bin/berks vendor cookbooks
- # sudo /opt/chef/bin/chef-client -z -o end_to_end --chef-license accept-no-persist
+ sudo /opt/chef/embedded/bin/bundle config set --local without 'omnibus_package'
+ sudo /opt/chef/embedded/bin/bundle config set --local path 'vendor/bundle'
+ sudo /opt/chef/embedded/bin/bundle install --jobs=3 --retry=3
+ sudo rm -f /opt/chef/embedded/bin/{htmldiff,ldiff}
+ sudo /opt/chef/embedded/bin/gem install berkshelf --no-doc
+ sudo /opt/chef/embedded/bin/berks vendor cookbooks
+ sudo /opt/chef/bin/chef-client -z -o end_to_end --chef-license accept-no-persist
linux:
@@ -207,6 +208,7 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@main
+ run: chef -v
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with: