summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorSeth Vargo <sethvargo@gmail.com>2013-06-07 09:32:28 -0700
committerSeth Vargo <sethvargo@gmail.com>2013-06-07 09:32:28 -0700
commite201aca7af925a88f2192d3eaf0c994f7029837f (patch)
treeb153b2083ead6d5c5fd844c68e085324a432468b /.travis.yml
parent451bd0a12a60d697891d08f22856864bd65bad5b (diff)
downloadchef-zero-e201aca7af925a88f2192d3eaf0c994f7029837f.tar.gz
Downgrade Puma so Chef Zero runs on Windows
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml21
1 files changed, 11 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 49ff340..da3c821 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,19 @@
-rvm:
- - 1.8.7
- - 1.9.2
- - 1.9.3
- - 2.0.0
- - jruby-19mode
-
script: bundle exec rake spec
matrix:
include:
+ - rvm: 1.8.7
+ env: SKIP_PEDANT=true
+ - rvm: 1.9.3
- rvm: 1.9.3
gemfile: gemfiles/gemfile.latest-pedant
+ - rvm: 1.9.3
+ env: SERVER=thin
+ - rvm: jruby-19mode
+ env: SKIP_PEDANT=true
+ - rvm: 2.0.0
+ - rvm: 2.0.0
+ env: SERVER=thin
allow_failures:
- - rvm: 1.8.7 # We support 1.8.7, but chef-pedant doesn't
- - rvm: 2.0.0 # chef-pedant has at least one failure in 2.0.0
- - rvm: jruby-19mode # Mixlib Shellout uses fork+exec
+ - rvm: jruby-19mode
- gemfile: gemfiles/gemfile.latest-pedant