diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-04-23 13:00:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 13:00:26 -0700 |
| commit | 0f0eb27e9843bf3f771f822ed211428a713dc571 (patch) | |
| tree | e0735b7971205471fc8fdda3f4281e983c3b9abc | |
| parent | 86e4132cb5e9987c9db0c29fd74f7a0a2ff4abab (diff) | |
| parent | b2492c30088222f583ace7e39df05a8e359521cb (diff) | |
| download | chef-zero-0f0eb27e9843bf3f771f822ed211428a713dc571.tar.gz | |
Merge pull request #281 from chef/lcg/bump-chef
pin chef to 14.x
| -rw-r--r-- | .travis.yml | 17 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | chef-zero.gemspec | 4 |
3 files changed, 6 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index ed06caf..faecf1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,6 @@ script: - bundle update - bundle exec rake pedant -env: - global: - - "GEMFILE_MOD=\"gem 'chef', '~> 13.0'\"" - matrix: include: - rvm: 2.5.0 @@ -27,16 +23,9 @@ matrix: - rvm: 2.5.0 env: SINGLE_ORG=true - rvm: 2.5.0 - env: CHEF_FS=true -# Commented out until we work with a released version again -# - rvm: 2.2.5 -# env: -# - CHEF_FS=true -# - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\"" -# - rvm: 2.3.1 -# env: -# - CHEF_FS=true -# - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\"" + env: + - CHEF_FS=true + - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\"" - rvm: 2.5.0 env: FILE_STORE=true - rvm: 2.5.0 @@ -15,7 +15,7 @@ if ENV["GEMFILE_MOD"] puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}" instance_eval(ENV["GEMFILE_MOD"]) else - gem "chef", "~> 13.0" + gem "chef", "~> 14.0" end # If you want to load debugging tools into the bundle exec sandbox, diff --git a/chef-zero.gemspec b/chef-zero.gemspec index 94465b9..8e6771f 100644 --- a/chef-zero.gemspec +++ b/chef-zero.gemspec @@ -12,9 +12,9 @@ Gem::Specification.new do |s| s.homepage = "http://www.chef.io" s.license = "Apache 2.0" - s.required_ruby_version = ">= 2.4.3" + s.required_ruby_version = ">= 2.4.0" - s.add_dependency "mixlib-log", "~> 1.3" + s.add_dependency "mixlib-log", "~> 2.0" s.add_dependency "hashie", ">= 2.0", "< 4.0" s.add_dependency "uuidtools", "~> 2.1" s.add_dependency "ffi-yajl", "~> 2.2" |