summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-08-23 14:32:13 -0700
committerJohn Keiser <john@johnkeiser.com>2016-08-23 14:32:13 -0700
commit0309deee4f8e9734295d21b5bbd4b4fe16b240cc (patch)
tree69270719f9e55184d18b50502d25d963afc55111
parent50db4d7be53df4bdf9b66da3c95914fc69068ce9 (diff)
downloadchef-zero-0309deee4f8e9734295d21b5bbd4b4fe16b240cc.tar.gz
Disable Ruby 2.1, bump dependencies accordingly
-rw-r--r--.travis.yml19
-rw-r--r--chef-zero.gemspec2
2 files changed, 7 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index 716638a..a179d82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,16 +18,12 @@ script:
matrix:
include:
- - rvm: 2.1.10
+ - rvm: 2.3.1
env: PEDANT_KNIFE_TESTS=true PEDANT_ALLOW_RVM=1
- - rvm: 2.1.10
+ - rvm: 2.3.1
env: SINGLE_ORG=true
- - rvm: 2.1.10
+ - rvm: 2.3.1
env: CHEF_FS=true
- - rvm: 2.1.10
- env:
- - CHEF_FS=true
- - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\""
- rvm: 2.2.5
env:
- CHEF_FS=true
@@ -36,20 +32,17 @@ matrix:
env:
- CHEF_FS=true
- "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\""
- - rvm: 2.1.10
+ - rvm: 2.3.1
env: FILE_STORE=true
- - rvm: 2.1.10
+ - rvm: 2.3.1
script: bundle exec rake chef_spec
env: TEST=chef_spec
- - rvm: 2.1.10
- script: bundle exec rake spec
- env: TEST=rake_spec
- rvm: 2.2.5
script: bundle exec rake spec
env: TEST=rake_spec
- rvm: 2.3.1
script: bundle exec rake spec
env: TEST=rake_spec
- - rvm: 2.1.10
+ - rvm: 2.3.1
script: bundle exec rake style
env: TEST=chefstyle
diff --git a/chef-zero.gemspec b/chef-zero.gemspec
index fd131a7..fcdb8e9 100644
--- a/chef-zero.gemspec
+++ b/chef-zero.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
s.homepage = "http://www.chef.io"
s.license = "Apache 2.0"
- s.required_ruby_version = ">= 2.1.0"
+ s.required_ruby_version = ">= 2.2.0"
s.add_dependency "mixlib-log", "~> 1.3"
s.add_dependency "hashie", ">= 2.0", "< 4.0"