From 29651834001b1ae89e0927c726080aa34ef118df Mon Sep 17 00:00:00 2001
From: Enis Inan <enis.inan@puppet.com>
Date: Tue, 8 Jan 2019 14:33:00 -0800
Subject: (maint) Update to PDK 1.8.0; update all templates

---
 .travis.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 9df4390..fdb8668 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,24 @@
 ---
-sudo: false
 dist: trusty
 language: ruby
 cache: bundler
 before_install:
-  - if [[ $TRAVIS_RUBY_VERSION =~ ^(2.1) ]]; then
-      gem update --system 2.7.8 && gem install bundler -v '< 2' --no-document;
+  - if [ $BUNDLER_VERSION ]; then
+      gem install -v $BUNDLER_VERSION bundler --no-rdoc --no-ri;
     fi
   - bundle -v
   - rm -f Gemfile.lock
-  - gem update --system
+  - gem update --system $RUBYGEMS_VERSION
   - gem --version
   - bundle -v
 script:
   - 'bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.5.3
+  - 2.5.1
 env:
   global:
-    - PUPPET_GEM_VERSION="~> 6.0"
+    - BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
 matrix:
   fast_finish: true
   include:
@@ -29,9 +28,9 @@ matrix:
       env: CHECK=parallel_spec
     -
       env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
-      rvm: 2.4.5
+      rvm: 2.4.4
     -
-      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
+      env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec RUBYGEMS_VERSION=2.7.8 BUNDLER_VERSION=1.17.3
       rvm: 2.1.9
 branches:
   only:
-- 
cgit v1.2.3