From bbe5e07f7a01d4c12767750e6280ce8f56d89070 Mon Sep 17 00:00:00 2001
From: Andrew White <andrew.white@unboxed.co>
Date: Thu, 3 Nov 2016 13:33:14 +0000
Subject: Update travis.yml to match master where appropriate

---
 .travis.yml | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6e1ab6c4f0..d1f24208a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,24 +7,40 @@ cache:
 services:
   - memcached
 
-script: 'ci/travis.rb'
+bundler_args: --without test --jobs 3 --retry 3
 before_install:
   - gem install bundler
+
+before_script:
+  - bundle update
+
+script: 'ci/travis.rb'
+
+env:
+  matrix:
+    - "GEM=railties"
+    - "GEM=ap,am,amo,ares,as"
+    - "GEM=ar:mysql"
+    - "GEM=ar:mysql2"
+    - "GEM=ar:sqlite3"
+    - "GEM=ar:postgresql"
+
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3
-env:
-  - "GEM=railties"
-  - "GEM=ap,am,amo,ares,as"
-  - "GEM=ar:mysql"
-  - "GEM=ar:mysql2"
-  - "GEM=ar:sqlite3"
-  - "GEM=ar:postgresql"
+  - 2.1.8
+  - 2.2.5
+  - 2.3.1
+
+# Railties specs on Ruby 1.8.7 are broken.
+# Last recorded passing CI run is https://travis-ci.org/rails/rails/builds/48782330
+matrix:
+  allow_failures:
+    - rvm: 1.8.7
+      env: GEM=railties
+
 notifications:
   email: false
   irc:
@@ -37,11 +53,3 @@ notifications:
     on_failure: always
     rooms:
       - secure: "YA1alef1ESHWGFNVwvmVGCkMe4cUy4j+UcNvMUESraceiAfVyRMAovlQBGs6\n9kBRm7DHYBUXYC2ABQoJbQRLDr/1B5JPf/M8+Qd7BKu8tcDC03U01SMHFLpO\naOs/HLXcDxtnnpL07tGVsm0zhMc5N8tq4/L3SHxK7Vi+TacwQzI="
-bundler_args: --path vendor/bundle
-
-# Railties specs on Ruby 1.8.7 are broken.
-# Last recorded passing CI run is https://travis-ci.org/rails/rails/builds/48782330
-matrix:
-  allow_failures:
-    - rvm: 1.8.7
-      env: GEM=railties
-- 
cgit v1.2.3