diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-12-23 13:50:19 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2021-01-04 17:02:18 -0800 |
| commit | f9cd19e77a2638b49f355edfd105a9f676d2ad29 (patch) | |
| tree | aa2bc0fa836a8009208dd0f20498b2d184ec7eae | |
| parent | d6ccd995f47034ce8c2b3f31ebd503f610e7ee03 (diff) | |
| download | ohai-f9cd19e77a2638b49f355edfd105a9f676d2ad29.tar.gz | |
Require Ruby 2.7 or later
We support N-1 and Ohai will support Ruby 3 and 2.7
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 11 | ||||
| -rw-r--r-- | .rubocop.yml | 2 | ||||
| -rw-r--r-- | ohai.gemspec | 6 |
3 files changed, 7 insertions, 12 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 763e633c..91b93a8e 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -24,29 +24,28 @@ steps: docker: image: ruby:2.7-buster -- label: run-specs-ruby-2.6 +- label: run-specs-ruby-2.7 command: - .expeditor/run_linux_tests.sh rspec expeditor: executor: docker: - image: ruby:2.6-buster + image: ruby:2.7-buster -- label: run-specs-ruby-2.7 +- label: run-specs-ruby-3.0 command: - .expeditor/run_linux_tests.sh rspec expeditor: executor: docker: - image: ruby:2.7-buster + image: ruby:3.0-buster - label: run-specs-windows command: - # we need the ruby 2.7 version of bundler, the 2.5/2.6 versions cannot pull our Gemfile correctly - - gem install bundler - bundle install --jobs=7 --retry=3 --without=profile - bundle exec rake spec expeditor: executor: docker: host_os: windows + image: rubydistros/windows-2019:2.7 diff --git a/.rubocop.yml b/.rubocop.yml index 9f82e5e8..37560a23 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,7 +2,7 @@ require: rubocop-performance AllCops: NewCops: enable - TargetRubyVersion: 2.5 + TargetRubyVersion: 2.7 Exclude: - "spec/data/**/*" - "vendor/**/*" diff --git a/ohai.gemspec b/ohai.gemspec index d9217002..e4baad37 100644 --- a/ohai.gemspec +++ b/ohai.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |s| s.email = "adam@chef.io" s.homepage = "https://github.com/chef/ohai/" - s.required_ruby_version = ">= 2.6" + s.required_ruby_version = ">= 2.7" s.add_dependency "chef-config", ">= 12.8", "< 18" s.add_dependency "chef-utils", ">= 16.0", "< 18" @@ -26,10 +26,6 @@ Gem::Specification.new do |s| s.add_dependency "plist", "~> 3.1" s.add_dependency "train-core" s.add_dependency "wmi-lite", "~> 1.0" - # Note for ohai developers: If chef-config causes you grief, try: - # bundle install --with development - # this should work as long as chef is a development dependency in Gemfile. - # s.bindir = "bin" s.executables = %w{ohai} |