From a66ff57d059c4a1f73a7263f8b931061217727d7 Mon Sep 17 00:00:00 2001
From: Vasu1105 <vjagdale@progress.com>
Date: Mon, 10 Jun 2024 14:49:46 +0530
Subject: [PATCH 1/2] Remove ruby 3.0 support

Signed-off-by: Vasu1105 <vjagdale@progress.com>
---
 .expeditor/coverage.pipeline.yml |  4 ++--
 .expeditor/verify.pipeline.yml   | 24 ++----------------------
 train-core.gemspec               |  2 +-
 train.gemspec                    |  2 +-
 4 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/.expeditor/coverage.pipeline.yml b/.expeditor/coverage.pipeline.yml
index 037068aa..81b891af 100644
--- a/.expeditor/coverage.pipeline.yml
+++ b/.expeditor/coverage.pipeline.yml
@@ -9,11 +9,11 @@ expeditor:
 
 steps:
 
-  - label: coverage-ruby-3.0.6
+  - label: coverage-ruby-3.1
     command:
       - CI_ENABLE_COVERAGE=1 RAKE_TASK=test /workdir/.expeditor/buildkite/coverage.sh
     expeditor:
       secrets: true
       executor:
         docker:
-          image: ruby:3.0.6
+          image: ruby:3.1-bullseye
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 689e1f76..7eb84e8d 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -9,21 +9,13 @@ expeditor:
 steps:
 
   # make sure lint runs on the oldest Ruby we support so we catch any new Ruby-isms here
-  - label: lint-ruby-3.0.6
+  - label: lint-ruby-3.1
     command:
       - RAKE_TASK=lint /workdir/.expeditor/buildkite/verify.sh
     expeditor:
       executor:
         docker:
-          image: ruby:3.0.6
-
-  - label: run-tests-ruby-3.0.6
-    command:
-      - /workdir/.expeditor/buildkite/verify.sh
-    expeditor:
-      executor:
-        docker:
-          image: ruby:3.0.6
+          image: ruby:3.1-bullseye
 
   - label: run-tests-ruby-3.1
     command:
@@ -33,18 +25,6 @@ steps:
         docker:
           image: ruby:3.1-bullseye
 
-  - label: run-tests-ruby-3.0-windows
-    command:
-      - /workdir/.expeditor/buildkite/verify.ps1
-    expeditor:
-      executor:
-        docker:
-          environment:
-            - BUILDKITE
-          host_os: windows
-          shell: ["powershell", "-Command"]
-          image: rubydistros/windows-2019:3.0
-
   - label: run-tests-ruby-3.1-windows
     command:
       - /workdir/.expeditor/buildkite/verify.ps1
diff --git a/train-core.gemspec b/train-core.gemspec
index fd68b25d..1b806b5f 100644
--- a/train-core.gemspec
+++ b/train-core.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
     "bug_tracker_uri" => "https://github.com/inspec/train/issues",
   }
 
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.1"
 
   spec.files = Dir.glob("{LICENSE,lib/**/*}")
     .grep_v(%r{transports/(azure|clients|docker|podman|gcp|helpers|vmware)})
diff --git a/train.gemspec b/train.gemspec
index 79185e1e..52e6c4ce 100644
--- a/train.gemspec
+++ b/train.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
     "bug_tracker_uri" => "https://github.com/inspec/train/issues",
   }
 
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.1"
 
   spec.files = %w{LICENSE} + Dir.glob("lib/**/*")
     .grep(%r{transports/(azure|clients|docker|podman|gcp|helpers|vmware)})

From b3a80c60dbd2461f3795941aa6735dc24e71869b Mon Sep 17 00:00:00 2001
From: Vasu1105 <vjagdale@progress.com>
Date: Mon, 10 Jun 2024 15:39:29 +0530
Subject: [PATCH 2/2] Unpin chefstyle version in Gemfile

Signed-off-by: Vasu1105 <vjagdale@progress.com>
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 93446fac..d17555a2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gemspec name: "train"
 group :test do
   gem "minitest", "~> 5.8"
   gem "rake", "~> 13.0"
-  gem "chefstyle", "2.1.1"
+  gem "chefstyle"
   gem "concurrent-ruby", "~> 1.0"
   gem "pry-byebug"
   gem "m"