Synchronize .travis.yml

[puppet-modules/puppetlabs-apt.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index a7f6b9c3f06a0ef0ded8556b9b82640c09c1ca63..c72d5e20fdeea3c1df54ff1c8203deb8e26eb310 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,17 @@
+---
 language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.3
-before_script:
-after_script:
-script: "rake spec"
-env:
-  - PUPPET_VERSION=3.0.2
-  - PUPPET_VERSION=2.7.20
-  - PUPPET_VERSION=2.7.6
-  - PUPPET_VERSION=2.6.9
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
- exclude:
+  fast_finish: true
+  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
-    gemfile: .gemfile
-    env: PUPPET_VERSION=2.6.9
-  - rvm: 1.9.3
-    gemfile: .gemfile
-    env: PUPPET_VERSION=2.7.6
-  - rvm: 1.9.3
-    gemfile: .gemfile
-    env: PUPPET_VERSION=2.7.20
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false
-gemfile: .gemfile