aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-12-21 16:57:43 +0100
committerYves Senn <yves.senn@gmail.com>2015-12-21 16:57:43 +0100
commitc3989819eaa8ff0be852f86f83a221bb11ffbcc3 (patch)
tree835976338558bc954ca8a86113db47ff2ebeba07 /ci
parenta88ab73f7e050bc1962e93fe76e73f303c1eaaa5 (diff)
parentbf8ca88b91225dc66c15e88acf438327b47344bb (diff)
downloadrails-c3989819eaa8ff0be852f86f83a221bb11ffbcc3.tar.gz
rails-c3989819eaa8ff0be852f86f83a221bb11ffbcc3.tar.bz2
rails-c3989819eaa8ff0be852f86f83a221bb11ffbcc3.zip
Merge pull request #22693 from yui-knk/use_appropriate_rebuild_task
Use an appropriate rebuild task on Travis
Diffstat (limited to 'ci')
-rwxr-xr-xci/travis.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/ci/travis.rb b/ci/travis.rb
index 608a6f578e..e9a3626b9a 100755
--- a/ci/travis.rb
+++ b/ci/travis.rb
@@ -60,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