From 702a204e195639e18dcea1fb6f776af6246f8780 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Tue, 27 Nov 2018 15:50:32 -0800 Subject: Test against puppet6 Also for appveyor, reduce matrix by eliminating 32-bit ruby for puppet 4 and 5. --- .travis.yml | 7 +++++-- appveyor.yml | 16 ++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 81f77dd..e8c30de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,10 @@ script: - 'bundle exec rake $CHECK' bundler_args: --without system_tests rvm: - - 2.4.1 + - 2.5.3 env: global: - - BEAKER_PUPPET_COLLECTION=puppet5 PUPPET_GEM_VERSION="~> 5.0" + - PUPPET_GEM_VERSION="~> 6.0" matrix: fast_finish: true include: @@ -24,6 +24,9 @@ matrix: env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop" - env: CHECK=parallel_spec + - + env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec + rvm: 2.4.5 - env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec rvm: 2.1.9 diff --git a/appveyor.yml b/appveyor.yml index 4a5b227..751bc39 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,23 +12,23 @@ init: environment: matrix: - - RUBY_VERSION: 24-x64 + RUBY_VERSION: 25-x64 CHECK: syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop - - - PUPPET_GEM_VERSION: ~> 4.0 - RUBY_VERSION: 21 - CHECK: parallel_spec - PUPPET_GEM_VERSION: ~> 4.0 RUBY_VERSION: 21-x64 CHECK: parallel_spec - PUPPET_GEM_VERSION: ~> 5.0 - RUBY_VERSION: 24 + RUBY_VERSION: 24-x64 CHECK: parallel_spec - - PUPPET_GEM_VERSION: ~> 5.0 - RUBY_VERSION: 24-x64 + PUPPET_GEM_VERSION: ~> 6.0 + RUBY_VERSION: 25 + CHECK: parallel_spec + - + PUPPET_GEM_VERSION: ~> 6.0 + RUBY_VERSION: 25-x64 CHECK: parallel_spec matrix: fast_finish: true -- cgit v1.2.3