diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-09-21 21:14:04 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-09-21 21:14:04 +0100 |
| commit | 340be9bddd8e5902e0218a0101a40a17a4afd558 (patch) | |
| tree | ef4de25f3f8eb610dc2235f0762b01cb1d464efd /ci | |
| parent | b31cdb55422226cd45a2234a4b54986f1f611151 (diff) | |
| parent | 1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50 (diff) | |
| download | rails-340be9bddd8e5902e0218a0101a40a17a4afd558.tar.gz rails-340be9bddd8e5902e0218a0101a40a17a4afd558.tar.bz2 rails-340be9bddd8e5902e0218a0101a40a17a4afd558.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/ci_build.rb | 3 | ||||
| -rw-r--r-- | ci/geminstaller.yml | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ci/ci_build.rb b/ci/ci_build.rb index 06e513f907..ab627b93e6 100755 --- a/ci/ci_build.rb +++ b/ci/ci_build.rb @@ -21,6 +21,7 @@ cd "#{root_dir}/activesupport" do puts "[CruiseControl] Building ActiveSupport" puts build_results[:activesupport] = system 'rake' + build_results[:activesupport_isolated] = system 'rake isolated_test' end rm_f "#{root_dir}/activerecord/debug.log" @@ -64,7 +65,7 @@ cd "#{root_dir}/actionpack" do puts puts "[CruiseControl] Building ActionPack" puts - build_results[:actionpack] = system 'rake' + build_results[:actionpack] = system 'gem bundle && rake' end cd "#{root_dir}/actionmailer" do diff --git a/ci/geminstaller.yml b/ci/geminstaller.yml index 3a4079ddbb..5a6f9bde01 100644 --- a/ci/geminstaller.yml +++ b/ci/geminstaller.yml @@ -15,8 +15,8 @@ gems: version: >= 0.8.0 - name: rack version: '~> 1.0.0' -- name: josh-rack-test - version: >= 0.4.1 +- name: rack-test + version: >= 0.4.2 - name: rake version: >= 0.8.1 - name: sqlite-ruby |