1 files changed, 10 insertions, 1 deletions
diff --git a/ci/travis.rb b/ci/travis.rb
index 658d66c6b4..e9a3626b9a 100755
--- a/ci/travis.rb
+++ b/ci/travis.rb
@@ -23,6 +23,7 @@ class Build
     'ar'       => 'activerecord',
     'av'       => 'actionview',
     'aj'       => 'activejob',
+    'ac'       => 'actioncable',
     'guides'   => 'guides'
   }
 
@@ -59,7 +60,14 @@ class Build
 
   def tasks
     if activerecord?
-      ['db:mysql:rebuild', "#{adapter}:#{'isolated_' if isolated?}test"]
+      tasks = ["#{adapter}:#{'isolated_' if isolated?}test"]
+      case adapter
+      when 'mysql2'
+        tasks.unshift 'db:mysql:rebuild'
+      when 'postgresql'
+        tasks.unshift 'db:postgresql:rebuild'
+      end
+      tasks
     else
       ["test", ('isolated' if isolated?), ('integration' if integration?)].compact.join(":")
     end
@@ -139,6 +147,7 @@ ENV['GEM'].split(',').each do |gem|
   [false, true].each do |isolated|
     next if ENV['TRAVIS_PULL_REQUEST'] && ENV['TRAVIS_PULL_REQUEST'] != 'false' && isolated
     next if gem == 'railties' && isolated
+    next if gem == 'ac' && isolated
     next if gem == 'aj:integration' && isolated
     next if gem == 'guides' && isolated