diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-12-25 01:31:44 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-12-25 01:35:53 +1030 |
| commit | 333af12c00939d11d810e948e950dacf50748eb3 (patch) | |
| tree | 5715aa858f3c08b08408a5fa7329115398d27776 /.travis.yml | |
| parent | 5b14129d8d4ad302b4e11df6bd5c7891b75f393c (diff) | |
| download | rails-333af12c00939d11d810e948e950dacf50748eb3.tar.gz rails-333af12c00939d11d810e948e950dacf50748eb3.tar.bz2 rails-333af12c00939d11d810e948e950dacf50748eb3.zip | |
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
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
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: |