Merge pull request ghoneycutt#49 from ghoneycutt/travis

Travis
joshuabaird · Jan 25, 2014 · 497a5bb · 497a5bb
2 parents c68707e + 0f17236
commit 497a5bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,18 @@
 ---
 env:
-- PUPPET_VERSION=2.7.23
 - PUPPET_VERSION=3.3.2
+- PUPPET_VERSION=3.4.2
 notifications:
 email: false
 rvm:
-- 1.9.3
 - 1.8.7
+- 1.9.3
+- 2.0.0
 matrix:
+  fast_finish: true
   allow_failures:
-  - env: PUPPET_VERSION=2.7.23
+  - rvm: 2.0.0
+  - env: PUPPET_VERSION=3.4.2
 language: ruby
 before_script: "gem install --no-ri --no-rdoc bundler"
 script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'

diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
+puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3']
 gem 'puppet', puppetversion
 gem 'puppetlabs_spec_helper', '>= 0.1.0'
 gem 'puppet-lint', '>= 0.3.2'