summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorTP Honey <tphoney@users.noreply.github.com>2017-08-11 09:56:53 +0100
committerGitHub <noreply@github.com>2017-08-11 09:56:53 +0100
commitc7ac34da3a8b70500143e326f8c4fa27ae7da311 (patch)
tree26721306dc6501ada77e48111b8e94f9856cf0b8 /.travis.yml
parentb89d5f388ca701e38a0e0337408f5ccb7e68565f (diff)
parent016f4dfd7f0c8a6b5b98fa38cf70434603c75883 (diff)
Merge branch 'master' into release
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 4981b25..0c6f904 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,10 +22,10 @@ matrix:
script: bundle exec rake beaker
services: docker
sudo: required
- - rvm: 2.3.1
+ - rvm: 2.4.0
bundler_args: --without system_tests
- env: PUPPET_GEM_VERSION="~> 4.0"
- - rvm: 2.1.7
+ env: PUPPET_GEM_VERSION="~> 5.0"
+ - rvm: 2.1.9
bundler_args: --without system_tests
env: PUPPET_GEM_VERSION="~> 4.0"
notifications: