diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 2a0822c5..3829e589 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -11,22 +11,13 @@ expeditor: steps: -- label: run-lint-and-specs-ruby-2.7 +- label: run-lint-and-specs-ruby-3.1 command: - .expeditor/run_linux_tests.sh rake expeditor: executor: docker: - image: ruby:2.7-buster - -- label: run-lint-and-specs-ruby-3.0 - command: - - .expeditor/run_linux_tests.sh rake - expeditor: - executor: - docker: - image: ruby:3.0-buster - + image: ruby:3.1-buster - label: run-lint-and-specs-windows command: - gem install chef-utils @@ -36,4 +27,4 @@ steps: executor: docker: host_os: windows - image: rubydistros/windows-2019:3.0 + image: rubydistros/windows-2019:3.1 diff --git a/Gemfile b/Gemfile index b1f8b9b5..638548b1 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,6 @@ if ENV["GEMFILE_MOD"] puts "GEMFILE_MOD: #{ENV["GEMFILE_MOD"]}" instance_eval(ENV["GEMFILE_MOD"]) else - gem "chef", git: "https://github.com/chef/chef", branch: "main" gem "ohai", git: "https://github.com/chef/ohai", branch: "main" gem "knife" end diff --git a/knife-windows.gemspec b/knife-windows.gemspec index e0baa38f..ff4e74c3 100644 --- a/knife-windows.gemspec +++ b/knife-windows.gemspec @@ -12,8 +12,8 @@ Gem::Specification.new do |s| s.summary = %q{Plugin that adds functionality to Chef Infra's Knife CLI for configuring/interacting with nodes running Microsoft Windows} s.description = s.summary - s.required_ruby_version = ">= 2.7.0" - s.add_dependency "chef", ">= 15.11" + s.required_ruby_version = ">= 3.1" + s.add_dependency "chef", ">= 18.2" s.add_dependency "winrm", "~> 2.1" s.add_dependency "winrm-elevated", "~> 1.0"