summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-05-27 14:42:51 -0700
committerJohn Keiser <jkeiser@opscode.com>2014-05-27 14:42:51 -0700
commit8632d76b1ee03ccdf258bb6b23a0dacc3e4ada46 (patch)
treed590712599a17dc08d575ff6cceb3f10b1e8ac19 /.travis.yml
parent7c78d743d7867b59912da2edc30414744a4101f5 (diff)
downloadchef-zero-8632d76b1ee03ccdf258bb6b23a0dacc3e4ada46.tar.gz
Run chef specs against chef-zero in travis on each checkin
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml18
1 files changed, 10 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 6e5b74f..aeb3329 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,28 +7,30 @@ script: bundle exec rake spec
matrix:
include:
- rvm: 1.8.7
- gemfile: Gemfile
- rvm: 1.8.7
env: SKIP_PEDANT=true
gemfile: gemfiles/no-pedant.gemfile
- rvm: 1.9.3
gemfile: gemfiles/latest-pedant.gemfile
- rvm: jruby-19mode
- gemfile: Gemfile
- rvm: jruby-19mode
env: SKIP_PEDANT=true
gemfile: gemfiles/no-pedant.gemfile
- rvm: 2.0.0
- gemfile: Gemfile
- rvm: 2.1.1
- gemfile: Gemfile
- rvm: 2.1.1
env: CHEF_FS=true
- gemfile: Gemfile
+ - rvm: 2.1.1
+ script: bundle exec rake chef_spec
+
allow_failures:
- rvm: 1.8.7
- gemfile: Gemfile
- rvm: jruby-19mode
- gemfile: Gemfile
- - rvm: 1.9.3
+ - rvm: 2.1.1
gemfile: gemfiles/latest-pedant.gemfile
+ - rvm: 2.1.1
+ gemfile: gemfiles/latest-chef.gemfile
+ script: bundle exec rake chef_spec
+# - rvm: 2.1.1
+# gemfile: gemfiles/berkshelf.gemfile
+# script: bundle exec rake berkshelf_spec