From ff6deb1772f2b6b09f2ea2a268e240b2e2fc5891 Mon Sep 17 00:00:00 2001
From: Jon Atack <jonnyatack@gmail.com>
Date: Thu, 20 Aug 2015 12:18:36 +0200
Subject: [PATCH] Travis-ci: revert the bundler cache part of previous commit

---
 .travis.yml | 103 ++++++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 55 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8567eeb..557c4f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,67 +4,60 @@ language: ruby
 
 sudo: false
 
-before_install:
-  - travis_retry gem install bundler
+rvm:
+  - 2.2.3
+  - 2.1
+  - 2.0
+  - 1.9
 
-cache:
-  - bundler
+env:
+  - RAILS=4-2-stable DB=mongodb
+  - RAILS=4-2-stable DB=sqlite3
+  - RAILS=4-2-stable DB=mysql
+  - RAILS=4-2-stable DB=postgres
 
-bundler:
-  rvm:
-    - 2.2.3
-    - 2.1
-    - 2.0
-    - 1.9
+  - RAILS=4-1-stable DB=mongodb
+  - RAILS=4-1-stable DB=sqlite3
+  - RAILS=4-1-stable DB=mysql
+  - RAILS=4-1-stable DB=postgres
 
-  env:
-    - RAILS=4-2-stable DB=mongodb
-    - RAILS=4-2-stable DB=sqlite3
-    - RAILS=4-2-stable DB=mysql
-    - RAILS=4-2-stable DB=postgres
+  - RAILS=4-0-stable DB=sqlite3
+  - RAILS=4-0-stable DB=mysql
+  - RAILS=4-0-stable DB=postgres
 
-    - RAILS=4-1-stable DB=mongodb
-    - RAILS=4-1-stable DB=sqlite3
-    - RAILS=4-1-stable DB=mysql
-    - RAILS=4-1-stable DB=postgres
+  - RAILS=3-2-stable DB=sqlite
+  - RAILS=3-2-stable DB=mysql
+  - RAILS=3-2-stable DB=postgres
 
-    - RAILS=4-0-stable DB=sqlite3
-    - RAILS=4-0-stable DB=mysql
-    - RAILS=4-0-stable DB=postgres
+  - RAILS=3-1-stable DB=sqlite
+  - RAILS=3-1-stable DB=mysql
+  - RAILS=3-1-stable DB=postgres
 
-    - RAILS=3-2-stable DB=sqlite
-    - RAILS=3-2-stable DB=mysql
-    - RAILS=3-2-stable DB=postgres
-
-    - RAILS=3-1-stable DB=sqlite
-    - RAILS=3-1-stable DB=mysql
-    - RAILS=3-1-stable DB=postgres
-
-  matrix:
-    include:
-      - rvm: 2.2
-        env: RAILS=master DB=sqlite3
-      - rvm: 2.2
-        env: RAILS=master DB=mysql
-      - rvm: 2.2
-        env: RAILS=master DB=postgres
-    exclude:
-      - rvm: 2.2
-        env: RAILS=3-1-stable DB=sqlite
-      - rvm: 2.2
-        env: RAILS=3-1-stable DB=mysql
-      - rvm: 2.2
-        env: RAILS=3-1-stable DB=postgres
-    allow_failures:
-      - env: RAILS=master DB=sqlite3
-      - env: RAILS=master DB=mysql
-      - env: RAILS=master DB=postgres
-      - rvm: 2.2
-        env: RAILS=3-2-stable DB=sqlite
-      - rvm: 2.2
-        env: RAILS=3-2-stable DB=mysql
-      - rvm: 2.2
-        env: RAILS=3-2-stable DB=postgres
+matrix:
+  include:
+    - rvm: 2.2
+      env: RAILS=master DB=sqlite3
+    - rvm: 2.2
+      env: RAILS=master DB=mysql
+    - rvm: 2.2
+      env: RAILS=master DB=postgres
+  exclude:
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=sqlite
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=mysql
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=postgres
+  allow_failures:
+    - env: RAILS=master DB=sqlite3
+    - env: RAILS=master DB=mysql
+    - env: RAILS=master DB=postgres
+    - rvm: 2.2
+      env: RAILS=3-2-stable DB=sqlite
+    - rvm: 2.2
+      env: RAILS=3-2-stable DB=mysql
+    - rvm: 2.2
+      env: RAILS=3-2-stable DB=postgres
 
 before_script:
   - mysql -e 'create database ransack collate utf8_general_ci;'