diff options
| author | Tim Smith <tsmith@chef.io> | 2021-01-15 09:16:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 09:16:59 -0800 |
| commit | 0108d3c2842320cee2525b4536f4aa0b51c825cc (patch) | |
| tree | 4b706bd96bd61659074a0856c8f6e128b71da632 | |
| parent | 95b84c6d1519abdacb29112940df5fb08407bd37 (diff) | |
| parent | beb2a4246ac29d8bd786a98c5f895eece7e3d907 (diff) | |
| download | chef-0108d3c2842320cee2525b4536f4aa0b51c825cc.tar.gz | |
Merge pull request #10885 from chef/remove_26
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 26 | ||||
| -rw-r--r-- | chef-config/chef-config.gemspec | 2 | ||||
| -rw-r--r-- | chef-utils/chef-utils.gemspec | 2 |
3 files changed, 28 insertions, 2 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 1121e04dd3..661017c0c1 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -12,6 +12,32 @@ expeditor: steps: ######################################################################### + # Tests Ruby 2.6 +######################################################################### + +- label: "chef-utils Unit :ruby: 2.6" + commands: + - /workdir/.expeditor/scripts/bk_container_prep.sh + - cd chef-utils + - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package + - bundle exec rake spec + expeditor: + executor: + docker: + image: rubydistros/ubuntu-18.04:2.6 + +- label: "chef-config Unit :ruby: 2.6" + commands: + - /workdir/.expeditor/scripts/bk_container_prep.sh + - cd chef-config + - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package + - bundle exec rake spec + expeditor: + executor: + docker: + image: rubydistros/ubuntu-18.04:2.6 + +######################################################################### # Tests Ruby 2.7 ######################################################################### diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec index 08086ff25b..cf83b360df 100644 --- a/chef-config/chef-config.gemspec +++ b/chef-config/chef-config.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |spec| spec.homepage = "https://github.com/chef/chef" spec.license = "Apache-2.0" - spec.required_ruby_version = ">= 2.6.0" + spec.required_ruby_version = ">= 2.6" spec.metadata = { "bug_tracker_uri" => "https://github.com/chef/chef/issues", diff --git a/chef-utils/chef-utils.gemspec b/chef-utils/chef-utils.gemspec index 836fef1ff9..a72b32936d 100644 --- a/chef-utils/chef-utils.gemspec +++ b/chef-utils/chef-utils.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |spec| spec.homepage = "https://github.com/chef/chef/tree/master/chef-utils" spec.license = "Apache-2.0" - spec.required_ruby_version = ">= 2.6.0" + spec.required_ruby_version = ">= 2.6" spec.metadata = { "bug_tracker_uri" => "https://github.com/chef/chef/issues", |