From 55a40b7a2ab4bc4b8025824107574246e0f77ddd Mon Sep 17 00:00:00 2001 From: Richard Clamp Date: Tue, 13 Feb 2018 17:18:59 +0000 Subject: [PATCH] Loosen the pinning on "ohai" Ohai requirement of ~> 8.0 is incompatible with Chef 13 or newer. Unpin the requirement a little to allow for Ohai up to 14.x, as for omnibus's needs the Ohai API should be stable up through Chef/Omnibus 14 As we may now resolve to a dependency that requires ruby >= 2.3, also bump Omnibus's minimum required ruby >= 2.3, and drops the 2.2 testing from appveyor and travis. Signed-off-by: Richard Clamp --- .travis.yml | 1 - appveyor.yml | 1 - omnibus.gemspec | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15e5a2a77..3440fe2ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ sudo: false rvm: - - 2.2.7 - 2.3.4 - 2.4.1 bundler_args: "--jobs 7 --without docs local" diff --git a/appveyor.yml b/appveyor.yml index 6ab45e7e6..de589fc5f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,6 @@ environment: matrix: - RUBY_VERSION: 24 - RUBY_VERSION: 23 - - RUBY_VERSION: 22 clone_folder: c:\projects\omnibus clone_depth: 1 diff --git a/omnibus.gemspec b/omnibus.gemspec index 0c720b7b6..313a31c04 100644 --- a/omnibus.gemspec +++ b/omnibus.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |gem| gem.description = gem.summary gem.homepage = "https://github.com/chef/omnibus" - gem.required_ruby_version = ">= 2.2" + gem.required_ruby_version = ">= 2.3" gem.files = %w{ LICENSE README.md Rakefile Gemfile } + Dir.glob("*.gemspec") + Dir.glob("{bin,lib,resources,spec}/**/*") gem.bindir = "bin" @@ -26,7 +26,7 @@ Gem::Specification.new do |gem| gem.add_dependency "cleanroom", "~> 1.0" gem.add_dependency "ffi-yajl", "~> 2.2" gem.add_dependency "mixlib-shellout", "~> 2.0" - gem.add_dependency "ohai", "~> 8.0" + gem.add_dependency "ohai", ">= 8.6.0.alpha.1", "< 15" gem.add_dependency "ruby-progressbar", "~> 1.7" gem.add_dependency "thor", "~> 0.18" gem.add_dependency "license_scout", "~> 1.0"