From d4a870f872734bc6ff2bf17734719983a2cd9626 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Mon, 20 Apr 2015 14:02:39 -0700 Subject: [PATCH 1/4] remove puppet 2.7 from travis matrix 4.0.0 has been released; support major release -1 --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 658c70d..0d0f8cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,17 +7,9 @@ rvm: - 2.0 - 2.1 env: - - PUPPET_GEM_VERSION="~> 2.7" - PUPPET_GEM_VERSION="~> 3.3" - PUPPET_GEM_VERSION="~> 3.7" FUTURE_PARSER="yes" matrix: - exclude: - - rvm: 1.9.3 - env: PUPPET_GEM_VERSION="~> 2.7" - - rvm: 2.0 - env: PUPPET_GEM_VERSION="~> 2.7" - - rvm: 2.1 - env: PUPPET_GEM_VERSION="~> 2.7" fast_finish: true notifications: email: false From d35115720d0b66f6f2705f234868d3813fda53b6 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Mon, 20 Apr 2015 14:03:30 -0700 Subject: [PATCH 2/4] add puppet 4.0 to travis matrix --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0d0f8cb..af1fea0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,11 @@ rvm: - 2.1 env: - PUPPET_GEM_VERSION="~> 3.3" - - PUPPET_GEM_VERSION="~> 3.7" FUTURE_PARSER="yes" + - PUPPET_GEM_VERSION="~> 4.0" matrix: + exclude: + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 4.0" fast_finish: true notifications: email: false From e8c960776b6fd458c8a87cb28ffde91661ed3e10 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Thu, 23 Apr 2015 11:59:58 -0700 Subject: [PATCH 3/4] update rspec-puppet gem version to ~> 2.1.0 For compatibility with puppet 4.0.0 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 74724f3..ce03a3c 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ group :development, :test do gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', '>= 1.1.0', :require => false gem 'puppet-syntax', :require => false - gem 'rspec-puppet', '~> 2.0.0', :require => false + gem 'rspec-puppet', '~> 2.1.0', :require => false end group :beaker do From e9a3823178c914e45f6304fa7e7fb31b845bf92c Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Thu, 23 Apr 2015 16:18:23 -0700 Subject: [PATCH 4/4] update travis matrix puppet 3.x minimum version to 3.7 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index af1fea0..d9fd10e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ rvm: - 2.0 - 2.1 env: - - PUPPET_GEM_VERSION="~> 3.3" + - PUPPET_GEM_VERSION="~> 3.7" - PUPPET_GEM_VERSION="~> 4.0" matrix: exclude: