X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=.travis.yml;h=b9abaccc41b0b7d5d9c806d3c4cd3d82658a9cb8;hb=bcd1a8d53caa4419d25430b67ddcfed839520c8a;hp=a7f6b9c3f06a0ef0ded8556b9b82640c09c1ca63;hpb=c46bc7fe4a0a89d25152c6d0dd5b5edeafee6f0a;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/.travis.yml b/.travis.yml
index a7f6b9c..b9abacc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,19 @@
+---
+branches:
+  only:
+    - master
 language: ruby
+bundler_args: --without development
+script: bundle exec rake spec SPEC_OPTS='--format documentation'
 rvm:
   - 1.8.7
   - 1.9.3
-before_script:
-after_script:
-script: "rake spec"
+  - 2.0.0
 env:
-  - PUPPET_VERSION=3.0.2
-  - PUPPET_VERSION=2.7.20
-  - PUPPET_VERSION=2.7.6
-  - PUPPET_VERSION=2.6.9
+  matrix:
+    - PUPPET_GEM_VERSION="~> 3.4.0"
+    - PUPPET_GEM_VERSION="~> 3.5.0"
 matrix:
- exclude:
-  - rvm: 1.9.3
-    gemfile: .gemfile
-    env: PUPPET_VERSION=2.6.9
-  - rvm: 1.9.3
-    gemfile: .gemfile
-    env: PUPPET_VERSION=2.7.6
-  - rvm: 1.9.3
-    gemfile: .gemfile
-    env: PUPPET_VERSION=2.7.20
+  fast_finish: true
 notifications:
   email: false
-gemfile: .gemfile