From b88339e1fc81fc242d071107e3c06557954f0853 Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Fri, 24 Jan 2014 20:34:16 -0500 Subject: [PATCH 1/4] Enable fast finish in Travis http://blog.travis-ci.com/2013-11-27-fast-finishing-builds/ --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0e44a4a..5b2652c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ rvm: - 1.9.3 - 1.8.7 matrix: + fast_finish: true allow_failures: - env: PUPPET_VERSION=2.7.23 language: ruby From 60a41230c498fbf9b0fb0e9934ed4bdcc3602e71 Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Fri, 24 Jan 2014 20:34:36 -0500 Subject: [PATCH 2/4] Test against Ruby v2.0.0 though allow it to fail --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5b2652c..11cd9a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,14 @@ env: 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 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' From c5d8868fdfef2dd134962772b33371e08f7d3906 Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Fri, 24 Jan 2014 20:34:54 -0500 Subject: [PATCH 3/4] Drop support for Puppet v2.7 --- .travis.yml | 2 -- Gemfile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11cd9a2..576ced5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ --- env: -- PUPPET_VERSION=2.7.23 - PUPPET_VERSION=3.3.2 notifications: email: false @@ -11,7 +10,6 @@ rvm: matrix: fast_finish: true allow_failures: - - env: PUPPET_VERSION=2.7.23 - rvm: 2.0.0 language: ruby before_script: "gem install --no-ri --no-rdoc bundler" diff --git a/Gemfile b/Gemfile index b40b4c0..0a648da 100644 --- 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' From 0f17236f758385dd5f906ac63552eda5ce207e0a Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Fri, 24 Jan 2014 20:35:21 -0500 Subject: [PATCH 4/4] Test against Puppet v3.4 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 576ced5..2c28477 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ --- env: - PUPPET_VERSION=3.3.2 +- PUPPET_VERSION=3.4.2 notifications: email: false rvm: @@ -11,6 +12,7 @@ matrix: fast_finish: true allow_failures: - 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'