From c626be796ce2fd716d72f8d38784eabe7267625e Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 10 Nov 2009 16:08:02 -0800
Subject: CI: rearrange build order, AR last

---
 ci/ci_build.rb | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index bece33e736..3a4515054a 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -38,26 +38,26 @@ cd "#{root_dir}/activesupport" do
   build_results[:activesupport_isolated] = rake 'test:isolated'
 end
 
-rm_f "#{root_dir}/activerecord/debug.log"
-cd "#{root_dir}/activerecord" do
+cd "#{root_dir}/railties" do
   puts
-  puts "[CruiseControl] Building ActiveRecord with MySQL"
+  puts "[CruiseControl] Building RailTies"
   puts
-  build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'test_mysql'
+  build_results[:railties] = rake
 end
 
-cd "#{root_dir}/activerecord" do
+cd "#{root_dir}/actionpack" do
   puts
-  puts "[CruiseControl] Building ActiveRecord with PostgreSQL"
+  puts "[CruiseControl] Building ActionPack"
   puts
-  build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'test_postgresql'
+  build_results[:actionpack] = rake
+  build_results[:actionpack_isolated] = rake 'test:isolated'
 end
 
-cd "#{root_dir}/activerecord" do
+cd "#{root_dir}/actionmailer" do
   puts
-  puts "[CruiseControl] Building ActiveRecord with SQLite 3"
+  puts "[CruiseControl] Building ActionMailer"
   puts
-  build_results[:activerecord_sqlite3] = rake 'test_sqlite3'
+  build_results[:actionmailer] = rake
 end
 
 cd "#{root_dir}/activemodel" do
@@ -75,26 +75,26 @@ cd "#{root_dir}/activeresource" do
   build_results[:activeresource] = rake
 end
 
-cd "#{root_dir}/actionpack" do
+rm_f "#{root_dir}/activerecord/debug.log"
+cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building ActionPack"
+  puts "[CruiseControl] Building ActiveRecord with MySQL"
   puts
-  build_results[:actionpack] = rake
-  build_results[:actionpack_isolated] = rake 'test:isolated'
+  build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'test_mysql'
 end
 
-cd "#{root_dir}/actionmailer" do
+cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building ActionMailer"
+  puts "[CruiseControl] Building ActiveRecord with PostgreSQL"
   puts
-  build_results[:actionmailer] = rake
+  build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'test_postgresql'
 end
 
-cd "#{root_dir}/railties" do
+cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building RailTies"
+  puts "[CruiseControl] Building ActiveRecord with SQLite 3"
   puts
-  build_results[:railties] = rake
+  build_results[:activerecord_sqlite3] = rake 'test_sqlite3'
 end
 
 
-- 
cgit v1.2.3