Merge branch 'master' into remove-old-ruby

1 files changed, 29 insertions, 7 deletions

diff --git a/.travis.yml b/.travis.yml
index 8bca456612..7ae6d12339 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,9 +27,14 @@ addons:
       secure: "TrzIv116JLGUxm6PAUskCYrv8KTDguncKROVwbnjVPKTGDAgoDderd8JUdDEXrKoZ9qGLD2TPYKExt9/QDl71E+qHdWnVqWv4HKCUk2P9z/VLKzHuggOUBkCXiJUhjywUieCJhI3N92bfq2EjSBbu2/OFHqWOjLQ+QCooTEBjv8="
 
 rvm:
-  - 2.5.1
-  - 2.4.3
-  - 2.3.7
+  - 2.6.0
+  - 2.5.3
+  - 2.4.5
+  - 2.3.8
+
+stages:
+  - linting
+  - test
 
 # Rubygems versions MUST be available as rake tasks
 # see Rakefile:125 for the list of possible RGV values
@@ -37,23 +42,40 @@ env:
   # We need to know if changes to rubygems will break bundler on release
   - RGV=master
   # Test the latest rubygems release with all of our supported rubies
-  - RGV=v2.7.7
+  - RGV=v3.0.1
 
-matrix:
+jobs:
   include:
+    - rvm: 2.6.0
+      script: rake rubocop
+      stage: linting
+    # Ruby 2.5, Rubygems 2.7 and up
+    - rvm: 2.5.3
+      env: RGV=v2.7.7
+      stage: test
     # Ruby 2.4, Rubygems 2.6 and up
-    - rvm: 2.4.2
+    - rvm: 2.4.5
       env: RGV=v2.6.14
+      stage: test
+    - rvm: 2.4.5
+      env: RGV=v2.7.7
+      stage: test
     # Ruby 2.3, Rubygems 2.5 and up
     - rvm: 2.3.7
       env: RGV=v2.5.2
+      stage: test
     - rvm: 2.3.7
       env: RGV=v2.6.14
+      stage: test
+    - rvm: 2.3.7
+      env: RGV=v2.7.7
+      stage: test
     # Ruby-head (we want to know how we're doing, but not fail the build)
     - rvm: ruby-head
       env: RGV=master
+      stage: test
     # 1.x mode (we want to keep stuff passing in 1.x mode for now)
-    - rvm: 2.5.1
+    - rvm: 2.6.0
       env: RGV=v2.7.7 BUNDLER_SPEC_SUB_VERSION=1.98
 
   allow_failures: