Permalink
Browse files

Don't ensure all keys in build_results are only written once, otherwi…

…se we get false positive builds reported.
  • Loading branch information...
1 parent 499dec0 commit 445c0607f7a85a0bb091764a132eed25b6ebf716 @jonleighton jonleighton committed Jun 6, 2011
Showing with 8 additions and 9 deletions.
  1. +8 −9 ci/ci_build.rb
View
@@ -85,8 +85,8 @@ def rake(*tasks)
puts "[CruiseControl] Building Active Record with MySQL IM enabled"
puts
ENV['IM'] = 'true'
- build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'mysql:test'
- build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
+ build_results[:activerecord_mysql_IM] = rake 'mysql:rebuild_databases', 'mysql:test'
+ build_results[:activerecord_mysql_isolated_IM] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
end
cd "#{root_dir}/activerecord" do
@@ -103,8 +103,8 @@ def rake(*tasks)
puts "[CruiseControl] Building Active Record with MySQL2 IM enabled"
puts
ENV['IM'] = 'true'
- build_results[:activerecord_mysql2] = rake 'mysql:rebuild_databases', 'mysql2:test'
- build_results[:activerecord_mysql2_isolated] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
+ build_results[:activerecord_mysql2_IM] = rake 'mysql:rebuild_databases', 'mysql2:test'
+ build_results[:activerecord_mysql2_isolated_IM] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
end
cd "#{root_dir}/activerecord" do
@@ -121,8 +121,8 @@ def rake(*tasks)
puts "[CruiseControl] Building Active Record with PostgreSQL IM enabled"
puts
ENV['IM'] = 'true'
- build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'postgresql:test'
- build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
+ build_results[:activerecord_postgresql8_IM] = rake 'postgresql:rebuild_databases', 'postgresql:test'
+ build_results[:activerecord_postgresql8_isolated_IM] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
end
cd "#{root_dir}/activerecord" do
@@ -139,8 +139,8 @@ def rake(*tasks)
puts "[CruiseControl] Building Active Record with SQLite 3 IM enabled"
puts
ENV['IM'] = 'true'
- build_results[:activerecord_sqlite3] = rake 'sqlite3:test'
- build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'
+ build_results[:activerecord_sqlite3_IM] = rake 'sqlite3:test'
+ build_results[:activerecord_sqlite3_isolated_IM] = rake 'sqlite3:isolated_test'
end
cd "#{root_dir}/activerecord" do
@@ -179,4 +179,3 @@ def rake(*tasks)
puts "[CruiseControl] Failed components: #{failures.map { |component| component.first }.join(', ')}"
exit(-1)
end
-

0 comments on commit 445c060

Please sign in to comment.