summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2013-06-07 11:00:25 -0700
committerJohn Keiser <jkeiser@opscode.com>2013-06-07 11:00:25 -0700
commit639516d4d8a5673f78d301273d450943b37e6b6b (patch)
tree95e836a87ba81852d81c5c77934e68e12b7f1c15 /.travis.yml
parent9b9997651a5c254a4657013bae92a114446c4269 (diff)
downloadchef-zero-639516d4d8a5673f78d301273d450943b37e6b6b.tar.gz
Add normal variants back to travis matrix
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 64acf54..d974f5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,15 +3,21 @@ script: bundle exec rake spec
matrix:
include:
- rvm: 1.8.7
+ gemfile: Gemfile
+ - rvm: 1.8.7
env: SKIP_PEDANT=true
gemfile: gemfiles/gemfile.no-pedant
- rvm: 1.9.3
- rvm: jruby-19mode
+ gemfile: Gemfile
+ - rvm: jruby-19mode
env: SKIP_PEDANT=true
gemfile: gemfiles/gemfile.no-pedant
- rvm: 2.0.0
allow_failures:
- rvm: 1.8.7
+ gemfile: Gemfile
- rvm: jruby-19mode
+ gemfile: Gemfile
- rvm: 1.9.3
gemfile: gemfiles/gemfile.latest-pedant