From 7a264c8026f7e44fb8200b0e37b2f36e6116d673 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 23 Apr 2018 11:04:51 -0700 Subject: pin chef to 14.x Signed-off-by: Lamont Granquist --- Gemfile | 2 +- chef-zero.gemspec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d9409a2..7ac46eb 100644 --- a/Gemfile +++ b/Gemfile @@ -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" -- cgit v1.2.1 From 1698224909b1ec4ddd1b3a69979e53e9f84ab5d9 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 23 Apr 2018 11:23:15 -0700 Subject: oops, don't need this in travis any more Signed-off-by: Lamont Granquist --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ed06caf..23da645 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 -- cgit v1.2.1 From b2492c30088222f583ace7e39df05a8e359521cb Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 23 Apr 2018 11:42:22 -0700 Subject: and test against chef/chef master in travis Signed-off-by: Lamont Granquist --- .travis.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23da645..faecf1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,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 -- cgit v1.2.1