From 3db5ab49f0f4b32cfca3a89f37848fe18325e8f4 Mon Sep 17 00:00:00 2001
From: Mathieu Bornoz <mathieu.bornoz@camptocamp.com>
Date: Mon, 29 Apr 2013 16:54:43 +0200
Subject: travis: small improvements

---
 .travis.yml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 37e322a..6d7c0f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,15 @@
 language: ruby
 rvm:
   - 1.8.7
-before_script:
-after_script:
-script: "rake spec"
-branches:
-  only:
-    - master
+  - 1.9.3
+  - 2.0.0
+  - ruby-head
 env:
-  - PUPPET_VERSION=2.7.13
-  - PUPPET_VERSION=2.7.6
-  - PUPPET_VERSION=2.6.9
-  - PUPPET_VERSION=3.0.0
-notifications:
-  email: false
-gemfile: .gemfile
+  - PUPPET_GEM_VERSION=">= 3.0.0"
+matrix:
+  allow_failures:
+    - rvm: 2.0.0
+    - rvm: ruby-head
+  include:
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 2.7"
-- 
cgit v1.2.3