Skip to content

Commit

Permalink
Merge pull request #783 from inspec/revert-781-vj/Remove-ruby-3.0-sup…
Browse files Browse the repository at this point in the history
…port

Revert "CHEF-13189: Remove ruby 3.0 support"
  • Loading branch information
Vasu1105 authored Jul 16, 2024
2 parents db2d0f7 + c7ae23e commit e3e3e08
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .expeditor/coverage.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ expeditor:

steps:

- label: coverage-ruby-3.1
- label: coverage-ruby-3.0.6
command:
- CI_ENABLE_COVERAGE=1 RAKE_TASK=test /workdir/.expeditor/buildkite/coverage.sh
expeditor:
secrets: true
executor:
docker:
image: ruby:3.1-bullseye
image: ruby:3.0.6
24 changes: 22 additions & 2 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,21 @@ expeditor:
steps:

# make sure lint runs on the oldest Ruby we support so we catch any new Ruby-isms here
- label: lint-ruby-3.1
- label: lint-ruby-3.0.6
command:
- RAKE_TASK=lint /workdir/.expeditor/buildkite/verify.sh
expeditor:
executor:
docker:
image: ruby:3.1-bullseye
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

- label: run-tests-ruby-3.1
command:
Expand All @@ -25,6 +33,18 @@ 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
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gemspec name: "train"
group :test do
gem "minitest", "~> 5.8"
gem "rake", "~> 13.0"
gem "chefstyle"
gem "chefstyle", "2.1.1"
gem "concurrent-ruby", "~> 1.0"
gem "pry-byebug"
gem "m"
Expand Down
2 changes: 1 addition & 1 deletion train-core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
"bug_tracker_uri" => "https://github.com/inspec/train/issues",
}

spec.required_ruby_version = ">= 3.1"
spec.required_ruby_version = ">= 2.7"

spec.files = Dir.glob("{LICENSE,lib/**/*}")
.grep_v(%r{transports/(azure|clients|docker|podman|gcp|helpers|vmware)})
Expand Down
2 changes: 1 addition & 1 deletion train.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
"bug_tracker_uri" => "https://github.com/inspec/train/issues",
}

spec.required_ruby_version = ">= 3.1"
spec.required_ruby_version = ">= 2.7"

spec.files = %w{LICENSE} + Dir.glob("lib/**/*")
.grep(%r{transports/(azure|clients|docker|podman|gcp|helpers|vmware)})
Expand Down

0 comments on commit e3e3e08

Please sign in to comment.