X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=.travis.yml;h=a19074d0b8412434d76d5d32f489c4210f9615e2;hb=142b72bbe21fcfa6bbd713f94c337ff3cda23b40;hp=03b1729d7100672535c46ae28a77e87b05d6ad75;hpb=abf1be8f22913c34aea1ef11c227e59bce9df2f6;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/.travis.yml b/.travis.yml
index 03b1729..a19074d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,29 @@
 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"
-branches:
-  only:
-    - master
+  - ruby-head
 env:
-  - PUPPET_VERSION=3.0.2
-  - PUPPET_VERSION=2.7.20
-  - PUPPET_VERSION=2.7.6
-  - PUPPET_VERSION=2.6.9
+  - PUPPET_GEM_VERSION="~> 2.6.0"
+  - PUPPET_GEM_VERSION="~> 2.7.0"
+  - PUPPET_GEM_VERSION="~> 3.0.0"
+  - PUPPET_GEM_VERSION="~> 3.1.0"
+  - PUPPET_GEM_VERSION="~> 3.2.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
+  exclude:
+    - rvm: ruby-head
+      env: PUPPET_GEM_VERSION="~> 3.0.0"
+    - rvm: ruby-head
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+    - rvm: ruby-head
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.6.0"
+    - rvm: ruby-head
+      env: PUPPET_GEM_VERSION="~> 2.6.0"
 notifications:
   email: false
-gemfile: .gemfile