From 1841d11ee3f885c902a4d41b94beee141a468fa2 Mon Sep 17 00:00:00 2001
From: Aaron Stone <aaron@serendipity.cx>
Date: Thu, 25 Jul 2013 09:30:06 -0700
Subject: Travis should run three Puppet versions in a matrix with three Ruby
 versions, but limit Puppet 2.6.x to Ruby 1.8.7.

---
 .travis.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index f349b8d..5e3f744 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,21 +5,30 @@ branches:
 notifications:
   email: false
 language: ruby
-script: 'bundle exec rake spec'
+script:
+- 'bundle exec gem list'
+- 'bundle exec rake spec'
 after_success:
 - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
 - .forge-releng/publish
 rvm:
 - 1.8.7
 - 1.9.3
+- 2.0.0
 env:
   matrix:
   - PUPPET_VERSION=2.6.18
-  - PUPPET_VERSION=2.7.21
-  - PUPPET_VERSION=3.1.1
+  - PUPPET_VERSION=2.7.22
+  - PUPPET_VERSION=3.2.1
   global:
   - PUBLISHER_LOGIN=puppetlabs
   - secure: |-
       ZiIkYd9+CdPzpwSjFPnVkCx1FIlipxpbdyD33q94h2Tj5zXjNb1GXizVy0NR
       kVxGhU5Ld8y9z8DTqKRgCI1Yymg3H//OU++PKLOQj/X5juWVR4URBNPeBOzu
       IJBDl1MADKA4i1+jAZPpz4mTvTtKS4pWKErgCSmhSfsY1hs7n6c=
+matrix:
+  exclude:
+  - rvm: 1.9.3
+    env: PUPPET_VERSION=2.6.18
+  - rvm: 2.0.0
+    env: PUPPET_VERSION=2.6.18
-- 
cgit v1.2.3