aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Helwig <jacob@technosorcery.net>2018-06-26 10:40:18 -0700
committerJacob Helwig <jacob@technosorcery.net>2018-06-26 10:40:18 -0700
commita6abaa4bc4469e75e913f20097820f45adbacccb (patch)
tree7200d66b0a41b9948dd955741e2272af038a7fcf
parentd32bd2c2b9f18bb9e57afea255aee1e1f24860f5 (diff)
downloadpuppet-sshkeys_core-a6abaa4bc4469e75e913f20097820f45adbacccb.tar.gz
puppet-sshkeys_core-a6abaa4bc4469e75e913f20097820f45adbacccb.tar.bz2
Update Travis config to test against Puppet 5 & modern Ruby
Rather than using the default config of testing against Puppet 4, and an old Ruby version, we now run the spec tests against Puppet 5, and a version of Ruby that is supported by Puppet 5.
-rw-r--r--.sync.yml5
-rw-r--r--.travis.yml3
2 files changed, 5 insertions, 3 deletions
diff --git a/.sync.yml b/.sync.yml
index dd4f0d1..e4407f1 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -40,3 +40,8 @@ Rakefile:
.gitlab-ci.yml:
delete: true
+
+.travis.yml:
+ remove_includes:
+ - env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
+ rvm: 2.1.9
diff --git a/.travis.yml b/.travis.yml
index 81f77dd..2c6edb7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,6 @@ 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="~> 4.0" CHECK=parallel_spec
- rvm: 2.1.9
branches:
only:
- master