From 5175ad039f8b317c8c61d2d05e9cbf026bb709ce Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 15 Jul 2024 16:57:52 +0530 Subject: [PATCH] added ruby 3.3 upgrade and chef upgrade Signed-off-by: nikhil2611 --- .github/workflows/ci.yml | 2 +- Gemfile | 1 + berkshelf.gemspec | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f778b8ab..e44994cdf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [ubuntu, macos, windows] - ruby: [2.7, 3.0, 3.1] + ruby: [3.3] steps: - run: | if [ "$RUNNER_OS" == "Linux" ]; then diff --git a/Gemfile b/Gemfile index 730ac41cd..84d02bbd4 100644 --- a/Gemfile +++ b/Gemfile @@ -18,6 +18,7 @@ group :development do gem "webmock", ">= 1.11" gem "http", ">= 0.9.8" gem "chefstyle" + gem "graphviz", "~> 1.2" end instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"] diff --git a/berkshelf.gemspec b/berkshelf.gemspec index 8857f4f77..a02b997d4 100644 --- a/berkshelf.gemspec +++ b/berkshelf.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.name = "berkshelf" s.require_paths = ["lib"] s.version = Berkshelf::VERSION - s.required_ruby_version = ">= 2.7.0" + s.required_ruby_version = ">= 3.3" s.required_rubygems_version = ">= 2.0.0" s.metadata = { "bug_tracker_uri" => "https://github.com/chef/berkshelf/issues", @@ -42,9 +42,9 @@ Gem::Specification.new do |s| s.add_dependency "octokit", "~> 4.0" s.add_dependency "mixlib-archive", ">= 1.1.4", "< 2.0" # needed for ruby 3.0 / Dir.chdir removal s.add_dependency "concurrent-ruby", "~> 1.0" - if RUBY_VERSION.match?(/3.0/) - s.add_dependency "chef", "~> 17.0" # needed for --skip-syntax-check - elsif + if RUBY_VERSION.match?(/3.3/) + s.add_dependency "chef", "~> 18.0" # needed for --skip-syntax-check + else s.add_dependency "chef", ">= 15.7.32" end s.add_dependency "chef-config"