diff options
| author | Josh Cooper <josh@puppet.com> | 2018-11-27 15:50:32 -0800 |
|---|---|---|
| committer | Josh Cooper <josh@puppet.com> | 2018-11-28 11:38:03 -0800 |
| commit | 702a204e195639e18dcea1fb6f776af6246f8780 (patch) | |
| tree | bfa8383f89b392496cb7ebbcfe90178a9e591569 | |
| parent | 525274766fb901c92e5b3ab6bf6467ca3d6f1e7b (diff) | |
| download | puppet-hosts_core-702a204e195639e18dcea1fb6f776af6246f8780.tar.gz puppet-hosts_core-702a204e195639e18dcea1fb6f776af6246f8780.tar.bz2 | |
Test against puppet6
Also for appveyor, reduce matrix by eliminating 32-bit ruby for puppet 4 and 5.
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | 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: @@ -25,6 +25,9 @@ matrix: - 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 branches: 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 |