Merge pull request #322 from cmurphy/master

Synchronize .travis.yml

diff --git a/.sync.yml b/.sync.yml
index 1b7c84ec849ffc58d9e3b23861dd726f1fa39f92..ed97d539c095cf1413af30cc23dea272095b97dd 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,5 +1 @@
 ---
-.travis.yml:
-  env_matrix:
-  - PUPPET_GEM_VERSION="~> 3.4.0"
-  - PUPPET_GEM_VERSION="~> 3.5.0"

diff --git a/.travis.yml b/.travis.yml
index f48d71a84795c574f84992b6f7d15c3f0a142b66..c72d5e20fdeea3c1df54ff1c8203deb8e26eb310 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,17 @@
 ---
-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"
 matrix:
   fast_finish: true
-  exclude:
+  include:
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.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