summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2022-07-27 11:21:24 -0700
committerJohn McCrae <john.mccrae@progress.com>2022-08-03 09:06:38 -0700
commitcda2023f6b8f7de267668a108d2c3ecba27d3afd (patch)
tree6c7549a6abcc65a203b92fb6931dfb6a41fcc274
parentc432577482476d59510b848d8d95109d346ce1dd (diff)
downloadchef-cda2023f6b8f7de267668a108d2c3ecba27d3afd.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.yml4
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock2
3 files changed, 3 insertions, 5 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 830c382efb..12301ef762 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -160,9 +160,7 @@ jobs:
# echo 'source $HOME/.zshenv' >> ~/.zshrc
echo 'eval "$(rbenv init - zsh)"' >> ~/.zshrc
source ~/.zshrc
- # echo 'eval "$(rbenv init -)"' >> ~/.bash_profile
- # source ~/.bash_profile
- # sudo rbenv install 3.1.2
+ rbenv install 3.1.2
# echo "which gem file are we using now?"
# which gem
# OHAI_VERSION=$(sed -n '/ohai .[0-9]/{s/.*(//;s/)//;p;}' Gemfile.lock)
diff --git a/Gemfile b/Gemfile
index 2bc5a4792d..9b17fe8aa2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ gem "cheffish", ">= 17"
group(:omnibus_package) do
gem "appbundler"
gem "rb-readline"
- gem "inspec-core-bin", "~> 5" # need to provide the binaries for inspec
+ gem "inspec-core-bin", ">= 5" # need to provide the binaries for inspec
gem "chef-vault"
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f7ab95ed5..5342e91f98 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -486,7 +486,7 @@ DEPENDENCIES
ed25519 (~> 1.2)
fauxhai-ng
ffi (>= 1.15.5)
- inspec-core-bin (~> 5)
+ inspec-core-bin (>= 5)
ohai!
proxifier!
pry (= 0.13.0)