X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=.travis.yml;h=6ff1d8a2a6851f4b28ce0c7e4af0ceace91d5b69;hb=e41fc4bbb4565986af2fe6b5f411cb5ddc74ca00;hp=c4bb092a71dc3becfe5062b19c09558e6d42e65f;hpb=d946753dc4c2ac376e3d1edae92d6884516ebe3a;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/.travis.yml b/.travis.yml
index c4bb092..6ff1d8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,27 @@
 ---
-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
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 3.3.0"
-    - PUPPET_GEM_VERSION="~> 3.4.0"
+sudo: false
+bundler_args: --without system_tests
+script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
+  include:
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 4.0"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 4.0"
+  allow_failures:
+    - env: PUPPET_GEM_VERSION="~> 4.0"
+    - env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
 notifications:
   email: false