From 8bbde47ae3c3917cf313fed3f94f4dcd5192b41e Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Fri, 27 Jun 2014 10:55:29 -0700
Subject: Synchronize .travis.yml

---
 .travis.yml | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index ef2a36e..c72d5e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +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="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.3.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
-after_success:
-- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-- .forge-release/publish
-before_install:
-- gem update --system 2.1.11
-- gem --version
-comments:
-- Temporary workaround for broken Rubygems on Travis
-
-- 
cgit v1.2.3