aboutsummaryrefslogtreecommitdiffstats
path: root/ci/ci_build.rb
diff options
context:
space:
mode:
Diffstat (limited to 'ci/ci_build.rb')
-rwxr-xr-xci/ci_build.rb12
1 files changed, 2 insertions, 10 deletions
diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index 0b9bd3d278..06e513f907 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -28,21 +28,14 @@ cd "#{root_dir}/activerecord" do
puts
puts "[CruiseControl] Building ActiveRecord with MySQL"
puts
- build_results[:activerecord_mysql] = system 'rake test_mysql'
+ build_results[:activerecord_mysql] = system 'rake mysql:rebuild_databases && rake test_mysql'
end
cd "#{root_dir}/activerecord" do
puts
puts "[CruiseControl] Building ActiveRecord with PostgreSQL"
puts
- build_results[:activerecord_postgresql8] = system 'rake test_postgresql'
-end
-
-cd "#{root_dir}/activerecord" do
- puts
- puts "[CruiseControl] Building ActiveRecord with SQLite 2"
- puts
- build_results[:activerecord_sqlite] = system 'rake test_sqlite'
+ build_results[:activerecord_postgresql8] = system 'rake postgresql:rebuild_databases && rake test_postgresql'
end
cd "#{root_dir}/activerecord" do
@@ -96,7 +89,6 @@ puts "[CruiseControl] #{`uname -a`}"
puts "[CruiseControl] #{`ruby -v`}"
puts "[CruiseControl] #{`mysql --version`}"
puts "[CruiseControl] #{`pg_config --version`}"
-puts "[CruiseControl] SQLite2: #{`sqlite -version`}"
puts "[CruiseControl] SQLite3: #{`sqlite3 -version`}"
`gem env`.each_line {|line| print "[CruiseControl] #{line}"}
puts "[CruiseControl] Local gems:"