diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index d3c2e272..a6e26678 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -7,15 +7,15 @@ expeditor: timeout_in_minutes: 30 steps: -- label: run-lint-and-specs-ruby-3.1 +- label: run-lint-and-specs-ruby-3.3 command: - .expeditor/run_linux_tests.sh rake expeditor: executor: docker: - image: ruby:3.1-buster + image: ruby:3.3 -- label: run-specs-windows-ruby-3.1 +- label: run-specs-windows-ruby-3.3 command: - bundle config --local path vendor/bundle - bundle config set --local without docs debug @@ -25,4 +25,4 @@ steps: executor: docker: host_os: windows - image: rubydistros/windows-2019:3.1 \ No newline at end of file + image: rubydistros/windows-2019:3.3 \ No newline at end of file diff --git a/Gemfile b/Gemfile index 0e91f877..6720e46b 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ group :debug do end group :test do - gem "chefstyle", "2.1.0" + gem "chefstyle", "2.2.3" gem "rake" gem "rspec", "~> 3.0" end diff --git a/knife-vsphere.gemspec b/knife-vsphere.gemspec index 6dd2d8e7..dc198034 100644 --- a/knife-vsphere.gemspec +++ b/knife-vsphere.gemspec @@ -9,11 +9,11 @@ Gem::Specification.new do |s| s.description = "VMware vSphere support for Chef Infra's Knife command" s.email = "ezra@cpan.org" s.files = Dir["lib/**/*"] + %w{LICENSE} - s.required_ruby_version = ">= 3.1" + s.required_ruby_version = ">= 3.3" s.homepage = "https://github.com/chef/knife-vsphere" s.license = "Apache-2.0" s.add_dependency "rbvmomi2", ">= 3.5.0", "< 4.0" s.add_dependency "filesize", ">= 0.1.1", "< 0.3.0" s.add_dependency "chef-vault", ">= 2.6" - s.add_dependency "knife", ">= 17" + s.add_dependency "knife", "~> 18" end diff --git a/spec/vsphere_vm_find_spec.rb b/spec/vsphere_vm_find_spec.rb index ddc5813f..b2bf0960 100644 --- a/spec/vsphere_vm_find_spec.rb +++ b/spec/vsphere_vm_find_spec.rb @@ -1,5 +1,6 @@ require "spec_helper" require "chef/knife/vsphere_vm_find" +require "ostruct" class Hash # An artifact of me using hashes to represent the VM -- the method needs to be there to mock