starting to integrate ruby 3.1 into the builds

Signed-off-by: John McCrae <john.mccrae@progress.com>

3 files changed, 34 insertions, 19 deletions

diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 597ff349dc..3d8a55d1a9 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -174,13 +174,17 @@ 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
+        echo "which bundler are we using?"
+        which bundle
+        echo "what version is that?"
+        bundle --version
+        # 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:
@@ -220,19 +224,30 @@ jobs:
           ruby -v
           echo "Which ruby are we using?"
           which ruby
-          gem install bundler:2.3.18
-          gem install chef-utils
-          gem install inspec
-          gem install kitchen-dokken
-          gem install kitchen-vagrant
-          gem install kitchen-inspec
-          echo "Installing Berkshelf now"
-          gem install berkshelf
-          echo "Finished Installing Berkshelf"
-          find / -name "chef" | grep -v "Permission denied"
+          sudo mv /home/runner/work/chef /home/runner/work/chef17
+          git clone git@github.com:chef/chef.git /home/runner/work/chef
+          cd home/runner/work/chef
+          bundle install
+          # gem install bundler:2.3.18
+          # gem install chef-utils
+          # gem install inspec
+          # gem install kitchen-dokken
+          # gem install kitchen-vagrant
+          # gem install kitchen-inspec
+          # echo "Installing Berkshelf now"
+          # gem install berkshelf
+          # echo "Finished Installing Berkshelf"
           # bundle install
           # which kitchen
           # kitchen diagnose --all
           # bundle exec kitchen test end-to-end-${{ matrix.os }}
           # /opt/hostedtoolcache/Ruby/3.1.2/x64/bin/kitchen test end-to-end-${{ matrix.os }}
           # sudo find / -name kitchen -type f
+          # /home/runner/work/chef
+          # /home/runner/work/chef/chef
+          # /home/runner/work/chef/chef/knife/lib/chef
+          # /home/runner/work/chef/chef/omnibus/package-scripts/chef
+          # /home/runner/work/chef/chef/omnibus/resources/chef
+          # /home/runner/work/chef/chef/lib/chef
+          # /home/runner/work/chef/chef/spec/support/lib/chef
+          # /home/runner/work/chef/chef/distro/templates/powershell/chef
diff --git a/chef-universal-mingw-ucrt.gemspec b/chef-universal-mingw-ucrt.gemspec
index f93279f6e0..8e472ccdda 100644
--- a/chef-universal-mingw-ucrt.gemspec
+++ b/chef-universal-mingw-ucrt.gemspec
@@ -1,4 +1,4 @@
-gemspec = eval(IO.read(File.expand_path("chef.gemspec", __dir__)))
+gemspec = instance_eval(File.read(File.expand_path("chef.gemspec", __dir__)))
 
 gemspec.platform = Gem::Platform.new(%w{x64-mingw-ucrt})
 
diff --git a/chef.gemspec b/chef.gemspec
index 2215f8c6de..ceed7fb943 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -53,7 +53,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-shellout", ">= 3.1.1", "< 4.0"
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
   s.add_dependency "ohai", "~> 18.0"
-  s.add_dependency "inspec-core", "~> 5"
+  s.add_dependency "inspec-core", ">= 5"
 
   s.add_dependency "ffi", ">= 1.15.5"
   s.add_dependency "ffi-yajl", "~> 2.2"