summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml30
1 files changed, 10 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml
index 985730f..c0b640e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,28 @@
-rvm: 1.9.3
-
+rvm: 2.0
gemfile: Gemfile
+sudo: false
script: bundle exec rake pedant
matrix:
include:
- - rvm: 1.8.7
- - rvm: 1.8.7
- env: SKIP_PEDANT=true
- gemfile: gemfiles/no-pedant.gemfile
- - rvm: jruby-19mode
- - rvm: jruby-19mode
- env: SKIP_PEDANT=true
- gemfile: gemfiles/no-pedant.gemfile
- - rvm: 2.0.0
- - rvm: 2.1.1
- - rvm: 2.1.1
+ - rvm: 2.0
+ - rvm: 2.1
+ - rvm: 2.1
env: SINGLE_ORG=true
- - rvm: 2.1.1
+ - rvm: 2.1
env: CHEF_FS=true
- - rvm: 2.1.1
+ - rvm: 2.1
env: FILE_STORE=true
- - rvm: 2.1.1
+ - rvm: 2.1
script: bundle exec rake chef_spec
env: TEST=chef_spec
- - rvm: 2.1.1
+ - rvm: 2.1
script: bundle exec rake spec
env: TEST=rake_spec
allow_failures:
- - rvm: 1.8.7
- - rvm: jruby-19mode
- - rvm: 2.1.1
+ - rvm: 2.1
gemfile: gemfiles/latest-chef.gemfile
script: bundle exec rake chef_spec
enc: TEST=chef_spec_latest