From 333af12c00939d11d810e948e950dacf50748eb3 Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Sun, 25 Dec 2016 01:31:44 +1030 Subject: Shuffle travis matrix * Run actionpack and actioncable tests together * Demote ac:integration to allow_failures -- it works most of the time, but still fails too frequently to rely upon --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 65644762a5..00f10d74e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,15 +34,14 @@ env: - "JRUBY_OPTS='--dev -J-Xmx1024M'" matrix: - "GEM=railties" - - "GEM=ap" - - "GEM=ac" - - "GEM=ac:integration" + - "GEM=ap,ac" - "GEM=am,amo,as,av,aj" - "GEM=as PRESERVE_TIMEZONES=1" - "GEM=ar:mysql2" - "GEM=ar:sqlite3" - "GEM=ar:postgresql" - "GEM=guides" + - "GEM=ac:integration" rvm: - 2.2.6 @@ -86,6 +85,7 @@ matrix: allow_failures: - rvm: ruby-head - rvm: jruby-9.1.5.0 + - env: "GEM=ac:integration" fast_finish: true notifications: -- cgit v1.2.3