From 1ec0308cda4a9d42300bc96ce0e9e4e9eb16d94b Mon Sep 17 00:00:00 2001
From: jayashri garud <jgarud@msystechnologies.com>
Date: Thu, 7 Apr 2022 10:42:10 +0530
Subject: add ruby tests 3.0/3.1

Signed-off-by: jayashri garud <jgarud@msystechnologies.com>
---
 .expeditor/run_windows_tests.ps1 | 17 +++++++++++++++++
 .expeditor/verify.pipeline.yml   | 40 ++++++++++++++++++++++++++--------------
 .github/CODEOWNERS               |  4 ++--
 mixlib-cli.gemspec               |  2 +-
 spec/mixlib/cli_spec.rb          |  1 +
 5 files changed, 47 insertions(+), 17 deletions(-)
 create mode 100644 .expeditor/run_windows_tests.ps1

diff --git a/.expeditor/run_windows_tests.ps1 b/.expeditor/run_windows_tests.ps1
new file mode 100644
index 0000000..f048b32
--- /dev/null
+++ b/.expeditor/run_windows_tests.ps1
@@ -0,0 +1,17 @@
+# Stop script execution when a non-terminating error occurs
+$ErrorActionPreference = "Stop"
+
+# This will run ruby test on windows platform
+
+Write-Output "--- Bundle install"
+
+bundle config --local path vendor/bundle
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
+
+bundle install --jobs=7 --retry=3
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
+
+Write-Output "--- Bundle Execute"
+
+bundle exec rake
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
\ No newline at end of file
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index d103ee1..0724ea3 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -6,43 +6,55 @@ expeditor:
 
 steps:
 
-- label: run-lint-and-specs-ruby-2.4
+- label: run-lint-and-specs-ruby-2.6
   command:
     - .expeditor/run_linux_tests.sh rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.4-buster
-
-- label: run-lint-and-specs-ruby-2.5
+        image: ruby:2.6
+- label: run-lint-and-specs-ruby-2.7
   command:
     - .expeditor/run_linux_tests.sh rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.5-buster
+        image: ruby:2.7
 
-- label: run-lint-and-specs-ruby-2.6
+- label: run-lint-and-specs-ruby-3.0
   command:
     - .expeditor/run_linux_tests.sh rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-buster
-- label: run-lint-and-specs-ruby-2.7
+        image: ruby:3.0
+
+- label: run-lint-and-specs-ruby-3.1
   command:
     - .expeditor/run_linux_tests.sh rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.7-buster
+        image: ruby:3.1
+
+- label: run-specs-ruby-3.0-windows
+  commands:
+   - .expeditor/run_windows_tests.ps1
+
+  expeditor:
+    executor:
+      docker:
+        host_os: windows
+        shell: ["powershell"]
+        image: rubydistros/windows-2019:3.0
+
+- label: run-specs-ruby-3.1-windows
+  commands:
+   - .expeditor/run_windows_tests.ps1
 
-- label: run-specs-windows
-  command:
-    - bundle config set --local without docs debug
-    - bundle install --jobs=7 --retry=3
-    - bundle exec rake
   expeditor:
     executor:
       docker:
         host_os: windows
+        shell: ["powershell"]
+        image: rubydistros/windows-2019:3.1
\ No newline at end of file
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 950afb7..36212ce 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # Order is important. The last matching pattern has the most precedence.
 
-*                 @chef/chef-foundation-owners @chef/chef-foundation-approvers @chef/chef-foundation-reviewers
-.expeditor/       @chef/jex-team
+*                 @chef/chef-infra-reviewers @chef/chef-infra-approvers @chef/chef-infra-owners
+.expeditor/       @chef/infra-packages
 *.md              @chef/docs-team
diff --git a/mixlib-cli.gemspec b/mixlib-cli.gemspec
index cbfa973..9eb7997 100644
--- a/mixlib-cli.gemspec
+++ b/mixlib-cli.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email = "info@chef.io"
   s.homepage = "https://github.com/chef/mixlib-cli"
   s.license = "Apache-2.0"
-  s.required_ruby_version = ">= 2.4"
+  s.required_ruby_version = ">= 2.6"
 
   s.require_path = "lib"
   s.files = %w{LICENSE NOTICE} + Dir.glob("lib/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
diff --git a/spec/mixlib/cli_spec.rb b/spec/mixlib/cli_spec.rb
index 922f28b..ea257bb 100644
--- a/spec/mixlib/cli_spec.rb
+++ b/spec/mixlib/cli_spec.rb
@@ -465,6 +465,7 @@ describe Mixlib::CLI do
       class T3 < TestCLI
         option :arg2, boolean: true
       end
+
       class T4 < T3
         option :arg3, boolean: true
       end
-- 
cgit v1.2.1