From 6ac29f137c79312766e5bca3ea3e273c388e0602 Mon Sep 17 00:00:00 2001 From: Rianol Jou Date: Fri, 2 Dec 2016 18:54:02 +0800 Subject: [PATCH] Drop pinning for 1.8.7 and tests --- .travis.yml | 24 ------------------------ Gemfile | 12 +++++++----- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index f6fb831..a4ba432 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,45 +5,21 @@ before_install: rm Gemfile.lock || true sudo: false cache: bundler rvm: - - 1.8.7 - 1.9.3 - 2.0.0 - 2.1.0 script: bundle exec rake test env: - - PUPPET_VERSION="~> 3.1.0" - PUPPET_VERSION="~> 3.3.0" - - PUPPET_VERSION="~> 3.7.4" FUTURE_PARSER=yes STRICT_VARIABLES=yes - PUPPET_VERSION="~> 3.8.4" - PUPPET_VERSION="~> 3.8.4" FUTURE_PARSER=yes STRICT_VARIABLES=yes - - PUPPET_VERSION="~> 4.0.0" - PUPPET_VERSION="~> 4.1.0" matrix: exclude: - - rvm: 1.9.3 - env: PUPPET_VERSION="~> 2.7.0" - - rvm: 2.0.0 - env: PUPPET_VERSION="~> 2.7.0" - - rvm: 2.0.0 - env: PUPPET_VERSION="~> 3.1.0" - - rvm: 2.1.0 - env: PUPPET_VERSION="~> 2.7.0" - - rvm: 2.1.0 - env: PUPPET_VERSION="~> 3.1.0" - - rvm: 2.1.0 - env: PUPPET_VERSION="~> 3.2.0" - rvm: 2.1.0 env: PUPPET_VERSION="~> 3.3.0" - rvm: 2.1.0 env: PUPPET_VERSION="~> 3.4.0" - - rvm: 1.9.3 - env: PUPPET_VERSION="~> 4.0.0" - - rvm: 1.8.7 - env: PUPPET_VERSION="~> 4.0.0" - - rvm: 2.0.0 - env: PUPPET_VERSION="~> 4.0.0" - - rvm: 1.8.7 - env: PUPPET_VERSION="~> 4.1.0" - rvm: 1.9.3 env: PUPPET_VERSION="~> 4.1.0" - rvm: 2.0.0 diff --git a/Gemfile b/Gemfile index e4e42c0..d01d78d 100644 --- a/Gemfile +++ b/Gemfile @@ -11,15 +11,17 @@ group :development do end group :test do - gem "json" + # Pin for 1.9.3 compatibility for now + gem "json", '~> 1.8.3' + gem "json_pure", '~> 1.8.3' + gem "rake" gem "puppet", ENV['PUPPET_VERSION'] || '~> 4' gem "puppet-lint" - # Pin for 1.8.7 compatibility for now - gem "rspec", '< 3.2.0' - gem "rspec-core", "3.1.7" - gem "rspec-puppet", "~> 2.1" + gem "rspec" + gem "rspec-core" + gem "rspec-puppet" gem "puppet-syntax" gem "puppetlabs_spec_helper"