From 88f1d7577f82e2430de09885c5c73ee73aa568ff Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 19 Jun 2024 10:42:25 +0530 Subject: [PATCH 1/5] added ruby 3.3 pipeline Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index d3c2e27..4b6df79 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -15,6 +15,14 @@ steps: docker: image: ruby:3.1-buster +- label: run-lint-and-specs-ruby-3.3 + command: + - .expeditor/run_linux_tests.sh rake + expeditor: + executor: + docker: + image: ruby:3.3 + - label: run-specs-windows-ruby-3.1 command: - bundle config --local path vendor/bundle From a4aa413ffeab2db958a33ad538f2f1d6673eacbf Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 19 Jun 2024 11:21:17 +0530 Subject: [PATCH 2/5] added require OpenStruct Signed-off-by: nikhil2611 --- spec/vsphere_vm_find_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/vsphere_vm_find_spec.rb b/spec/vsphere_vm_find_spec.rb index ddc5813..2fc0333 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 From ccbcb5a04c7639c5912f2df8b422de68d3ecf6f5 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 19 Jun 2024 11:35:51 +0530 Subject: [PATCH 3/5] added require OpenStruct Signed-off-by: nikhil2611 --- spec/vsphere_vm_find_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/vsphere_vm_find_spec.rb b/spec/vsphere_vm_find_spec.rb index 2fc0333..b2bf096 100644 --- a/spec/vsphere_vm_find_spec.rb +++ b/spec/vsphere_vm_find_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" require "chef/knife/vsphere_vm_find" -require 'ostruct' +require "ostruct" class Hash # An artifact of me using hashes to represent the VM -- the method needs to be there to mock From bc519c8e7ad0b52f4f4e362a746b5e60ce8cc51a Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 22 Jul 2024 14:54:23 +0530 Subject: [PATCH 4/5] updated pipeline of ruby 3.3 Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 12 ++---------- knife-vsphere.gemspec | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 4b6df79..a6e2667 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -7,14 +7,6 @@ expeditor: timeout_in_minutes: 30 steps: -- label: run-lint-and-specs-ruby-3.1 - command: - - .expeditor/run_linux_tests.sh rake - expeditor: - executor: - docker: - image: ruby:3.1-buster - - label: run-lint-and-specs-ruby-3.3 command: - .expeditor/run_linux_tests.sh rake @@ -23,7 +15,7 @@ steps: docker: 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 @@ -33,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/knife-vsphere.gemspec b/knife-vsphere.gemspec index 6dd2d8e..dc19803 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 From c9b4e3cb02c3556b062141c1dd37dca1087a8560 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 22 Jul 2024 14:56:11 +0530 Subject: [PATCH 5/5] updated chefstyle to 2.2.3 Signed-off-by: nikhil2611 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0e91f87..6720e46 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