From 4f6d8ceb0436cf7eea435bdfed87ecf5aba050c1 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 19 Oct 2009 19:22:23 -0700 Subject: Bundle for railties tests too --- ci/ci_build.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci/ci_build.rb') diff --git a/ci/ci_build.rb b/ci/ci_build.rb index 3b06c9c7ce..6574481c19 100755 --- a/ci/ci_build.rb +++ b/ci/ci_build.rb @@ -80,7 +80,7 @@ cd "#{root_dir}/railties" do puts puts "[CruiseControl] Building RailTies" puts - build_results[:railties] = system 'rake' + build_results[:railties] = system 'gem bundle && rake' end -- cgit v1.2.3 From 207d0483e57b8d017ddd0c225d30a3e4fc9edc0c Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 20 Oct 2009 15:28:34 -0500 Subject: Run bundler before AM and AMo tests --- ci/ci_build.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ci/ci_build.rb') diff --git a/ci/ci_build.rb b/ci/ci_build.rb index 6574481c19..c49fb5f0c4 100755 --- a/ci/ci_build.rb +++ b/ci/ci_build.rb @@ -50,7 +50,7 @@ cd "#{root_dir}/activemodel" do puts puts "[CruiseControl] Building ActiveModel" puts - build_results[:activemodel] = system 'rake' + build_results[:activemodel] = system 'gem bundle && rake' end rm_f "#{root_dir}/activeresource/debug.log" @@ -73,7 +73,7 @@ cd "#{root_dir}/actionmailer" do puts puts "[CruiseControl] Building ActionMailer" puts - build_results[:actionmailer] = system 'rake' + build_results[:actionmailer] = system 'gem bundle && rake' end cd "#{root_dir}/railties" do -- cgit v1.2.3 From b3012bbd1637e61c628fc700f885ab4a06251175 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 27 Oct 2009 01:55:17 -0700 Subject: Tweak CI for toplevel gem bundle --- ci/ci_build.rb | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'ci/ci_build.rb') diff --git a/ci/ci_build.rb b/ci/ci_build.rb index c49fb5f0c4..23e223b1b2 100755 --- a/ci/ci_build.rb +++ b/ci/ci_build.rb @@ -16,6 +16,14 @@ root_dir = File.expand_path(File.dirname(__FILE__) + "/..") # A security hole, but there is nothing valuable on rails CI box anyway. build_results[:geminstaller] = system "sudo geminstaller --config=#{root_dir}/ci/geminstaller.yml --exceptions" +rm_f "#{root_dir}/vendor" +cd root_dir do + puts + puts "[CruiseControl] Bundling RubyGems" + puts + build_results[:bundle] = system 'gem bundle' +end + cd "#{root_dir}/activesupport" do puts puts "[CruiseControl] Building ActiveSupport" @@ -29,28 +37,28 @@ cd "#{root_dir}/activerecord" do puts puts "[CruiseControl] Building ActiveRecord with MySQL" puts - build_results[:activerecord_mysql] = system 'gem bundle && rake mysql:rebuild_databases && 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 'gem bundle && rake postgresql:rebuild_databases && rake test_postgresql' + build_results[:activerecord_postgresql8] = system 'rake postgresql:rebuild_databases && rake test_postgresql' end cd "#{root_dir}/activerecord" do puts puts "[CruiseControl] Building ActiveRecord with SQLite 3" puts - build_results[:activerecord_sqlite3] = system 'gem bundle && rake test_sqlite3' + build_results[:activerecord_sqlite3] = system 'rake test_sqlite3' end cd "#{root_dir}/activemodel" do puts puts "[CruiseControl] Building ActiveModel" puts - build_results[:activemodel] = system 'gem bundle && rake' + build_results[:activemodel] = system 'rake' end rm_f "#{root_dir}/activeresource/debug.log" @@ -65,7 +73,7 @@ cd "#{root_dir}/actionpack" do puts puts "[CruiseControl] Building ActionPack" puts - build_results[:actionpack] = system 'gem bundle && rake' + build_results[:actionpack] = system 'rake' build_results[:actionpack_isolated] = system 'rake test:isolated' end @@ -73,14 +81,14 @@ cd "#{root_dir}/actionmailer" do puts puts "[CruiseControl] Building ActionMailer" puts - build_results[:actionmailer] = system 'gem bundle && rake' + build_results[:actionmailer] = system 'rake' end cd "#{root_dir}/railties" do puts puts "[CruiseControl] Building RailTies" puts - build_results[:railties] = system 'gem bundle && rake' + build_results[:railties] = system 'rake' end -- cgit v1.2.3 From 58555d0c8b8beaee02ad72cfaf262dbf21674066 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 27 Oct 2009 02:03:25 -0700 Subject: Remove old per-component bundled environments first --- ci/ci_build.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'ci/ci_build.rb') diff --git a/ci/ci_build.rb b/ci/ci_build.rb index 23e223b1b2..b2f9f59bec 100755 --- a/ci/ci_build.rb +++ b/ci/ci_build.rb @@ -17,6 +17,7 @@ root_dir = File.expand_path(File.dirname(__FILE__) + "/..") build_results[:geminstaller] = system "sudo geminstaller --config=#{root_dir}/ci/geminstaller.yml --exceptions" rm_f "#{root_dir}/vendor" +system "rm -rf #{root_dir}/*/vendor" cd root_dir do puts puts "[CruiseControl] Bundling RubyGems" -- cgit v1.2.3