Skip to content

Commit

Permalink
Loosen the pinning on "ohai"
Browse files Browse the repository at this point in the history
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 <richardc@unixbeard.net>
  • Loading branch information
richardc committed Feb 16, 2018
1 parent 63e9081 commit 55a40b7
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
sudo: false
rvm:
- 2.2.7
- 2.3.4
- 2.4.1
bundler_args: "--jobs 7 --without docs local"
Expand Down
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ environment:
matrix:
- RUBY_VERSION: 24
- RUBY_VERSION: 23
- RUBY_VERSION: 22

clone_folder: c:\projects\omnibus
clone_depth: 1
Expand Down
4 changes: 2 additions & 2 deletions omnibus.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit 55a40b7

Please sign in to comment.