X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=.travis.yml;h=66e90e38df88ce1b76267e2716398459b39b88ee;hb=4b66a649402e5f8affbaa8b7d35a1dfe5a195774;hp=f48d71a84795c574f84992b6f7d15c3f0a142b66;hpb=fd1e2ec12cc9af80534411f91f5dd0554fedac90;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/.travis.yml b/.travis.yml
index f48d71a..66e90e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,15 @@
 ---
-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.4.0"
-  - PUPPET_GEM_VERSION="~> 3.5.0"
+script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
-  exclude:
+  include:
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
+    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
+    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false