Skip to content

Commit

Permalink
Remove support for versions of ruby prior to 2.6
Browse files Browse the repository at this point in the history
Ruby 2.5 and earlier are all EOL and are no longer receiving security
updates

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
  • Loading branch information
marcparadise committed Sep 16, 2022
1 parent 69d1464 commit d7d64f3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 29 deletions.
20 changes: 2 additions & 18 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,13 @@ expeditor:

steps:

- label: run-lint-ruby-2.4
- label: run-lint-ruby-2.6
command:
- .expeditor/run_linux_tests.sh rake style
expeditor:
executor:
docker:
image: ruby:2.4

- label: run-specs-ruby-2.4
command:
- .expeditor/run_linux_tests.sh rake
expeditor:
executor:
docker:
image: ruby:2.4

- label: run-specs-ruby-2.5
command:
- .expeditor/run_linux_tests.sh rake
expeditor:
executor:
docker:
image: ruby:2.5
image: ruby:2.6

- label: run-specs-ruby-2.6
command:
Expand Down
12 changes: 2 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,14 @@ source "https://rubygems.org"

gemspec

gem "chef-utils", "= 16.6.14" if RUBY_VERSION < "2.6.0"

group :test do
gem "rake"
gem "rspec"
gem "webrick"
gem "webmock", "~> 3.4"
gem "contracts", "~> 0.16.0" # this entry can go away when ruby < 3 support is gone
if RUBY_VERSION < "2.6.0"
gem "climate_control", "= 0.1.0"
gem "vcr", "= 6.0.0"
gem "mixlib-shellout", "= 3.2.5"
else
gem "climate_control", "~> 1.0"
gem "vcr"
end
gem "climate_control", "~> 1.0"
gem "vcr"
end

# use old chefstyle to support TargetRubyVersion of 1.9
Expand Down
2 changes: 1 addition & 1 deletion mixlib-install.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
spec.files = %w{LICENSE Gemfile Rakefile} + Dir.glob("*.gemspec") + Dir.glob("{bin,lib,support}/**/*")
spec.executables = ["mixlib-install"]
spec.require_paths = ["lib"]

spec.required_ruby_version = ">= 2.6.0"
spec.add_dependency "mixlib-shellout"
spec.add_dependency "mixlib-versioning"
spec.add_dependency "thor"
Expand Down

0 comments on commit d7d64f3

Please sign in to comment.