Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CHEF-13189: Remove ruby 3.0 support #781

Merged
merged 2 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.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
24 changes: 2 additions & 22 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
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", "2.1.1"
gem "chefstyle"
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 = ">= 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)})
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 = ">= 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)})
Expand Down