diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-12-05 16:13:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-05 16:13:08 -0800 |
| commit | f69a450200e020961c988da2476b9f26de32d1d2 (patch) | |
| tree | 24e971b1ac051808e45a10a4a6b170785efbd096 | |
| parent | a05cc21d88ce72258e4a58e6d7c98fb584e79382 (diff) | |
| parent | 874e8491b72722ad9895b3a9a345f999c4c05d7a (diff) | |
| download | chef-f69a450200e020961c988da2476b9f26de32d1d2.tar.gz | |
Merge pull request #8023 from chef/15_plus
Require Ruby 2.5 or later
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rw-r--r-- | chef.gemspec | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml index b918dfe7d3..d5d1a7d707 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,38 +35,18 @@ env: matrix: include: - env: - INTEGRATION_SPECS_24: 1 - rvm: 2.4.5 - sudo: true - script: sudo -E $(which bundle) exec rake spec:integration; - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - - env: INTEGRATION_SPECS_25: 1 rvm: 2.5.3 sudo: true script: sudo -E $(which bundle) exec rake spec:integration; bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: - FUNCTIONAL_SPECS_24: 1 - rvm: 2.4.5 - sudo: true - script: sudo -E $(which bundle) exec rake spec:functional; - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - - env: FUNCTIONAL_SPECS_25: 1 rvm: 2.5.3 sudo: true script: sudo -E $(which bundle) exec rake spec:functional; bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: - UNIT_SPECS_24: 1 - rvm: 2.4.5 - sudo: true - script: - - sudo -E $(which bundle) exec rake spec:unit; - - sudo -E $(which bundle) exec rake component_specs - bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - - env: UNIT_SPECS_25: 1 rvm: 2.5.3 sudo: true diff --git a/chef.gemspec b/chef.gemspec index c787e00580..15fc862deb 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.email = "adam@chef.io" s.homepage = "https://www.chef.io" - s.required_ruby_version = ">= 2.4.0" + s.required_ruby_version = ">= 2.5.0" s.add_dependency "chef-config", "= #{Chef::VERSION}" |