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

diff --git a/.travis.yml b/.travis.yml
index c825f5e..b9abacc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,36 +1,19 @@
+---
+branches:
+  only:
+    - master
 language: ruby
 bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+script: bundle exec rake spec SPEC_OPTS='--format documentation'
 rvm:
   - 1.8.7
   - 1.9.3
-  - ruby-head
+  - 2.0.0
 env:
-<<<<<<< HEAD
-  - PUPPET_VERSION=3.0.1
-  - PUPPET_VERSION=2.7.13
-  - 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:
+    - PUPPET_GEM_VERSION="~> 3.4.0"
+    - PUPPET_GEM_VERSION="~> 3.5.0"
 matrix:
-  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"
->>>>>>> 18ee4cc6c9eb8d16becfec68254d8955eb10c7d5
+  fast_finish: true
 notifications:
   email: false