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

diff --git a/.travis.yml b/.travis.yml
index dd3394d..66e90e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,15 @@
+---
 language: ruby
 bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - ruby-head
-env:
-  - PUPPET_GEM_VERSION="~> 2.6"
-  - PUPPET_GEM_VERSION="~> 2.7"
-  - PUPPET_GEM_VERSION="~> 3.0"
+script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
-  allow_failures:
-    - rvm: ruby-head
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.6"
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 2.6"
+  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"
 notifications:
   email: false