From 6b29f37588a4a092f8dc6e021fa249b17f229435 Mon Sep 17 00:00:00 2001
From: Jon Atack <jonnyatack@gmail.com>
Date: Tue, 2 Dec 2014 10:10:19 +0100
Subject: [PATCH] Update travis-ci for Rails 5.0.0 and 4-2-stable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Arel and Active Record have breaking changes in Rails 5.0.0 and we’ll
need to add an adapter for compatibility.

The Mongoid gem has not yet updated its dependancies for Rails 5.
---
 .travis.yml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d70cf63..4f4ffc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,27 +10,38 @@ rvm:
   - 1.9
 
 env:
-  - RAILS=master DB=mongodb
-  - RAILS=master DB=sqlite3
-  - RAILS=master DB=mysql
   - RAILS=master DB=postgres
+
+  - 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-1-stable DB=mongodb
   - RAILS=4-1-stable DB=sqlite3
   - RAILS=4-1-stable DB=mysql
   - RAILS=4-1-stable DB=postgres
+
   - RAILS=4-0-stable DB=sqlite3
   - RAILS=4-0-stable DB=mysql
   - RAILS=4-0-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
+
   - RAILS=3-0-stable DB=sqlite
   - RAILS=3-0-stable DB=mysql
   - RAILS=3-0-stable DB=postgres
 
+matrix:
+  allow_failures:
+    - env: RAILS=master DB=postgres
+
 before_script:
   - mysql -e 'create database ransack collate utf8_general_ci;'
   - mysql -e 'use ransack;show variables like "%character%";show variables like "%collation%";'