diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-09-30 22:27:02 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-09-30 22:27:02 +0100 |
| commit | dd2779e1b83b4d867d47dd286ec0c919f5df12a9 (patch) | |
| tree | 6e52ea0a329c24429f4d1d41b065e082f0ed6baa /ci | |
| parent | 329b14aa8fdd291a00d17ba12c2e0ab4c3a157cc (diff) | |
| parent | 420004e030e96f2ace6e27fd622c90ee9e986677 (diff) | |
| download | rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.tar.gz rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.tar.bz2 rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/ci_build.rb | 2 | ||||
| -rw-r--r-- | ci/ci_setup_notes.txt | 4 | ||||
| -rw-r--r-- | ci/geminstaller.yml | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ci/ci_build.rb b/ci/ci_build.rb index ab627b93e6..fd55444889 100755 --- a/ci/ci_build.rb +++ b/ci/ci_build.rb @@ -21,7 +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' + build_results[:activesupport_isolated] = system 'rake test:isolated' end rm_f "#{root_dir}/activerecord/debug.log" diff --git a/ci/ci_setup_notes.txt b/ci/ci_setup_notes.txt index 7581a24672..b61e893b8e 100644 --- a/ci/ci_setup_notes.txt +++ b/ci/ci_setup_notes.txt @@ -104,8 +104,8 @@ end $ sudo aptitude install mysql-server-5.0 libmysqlclient-dev # no password for mysql root user -* setup sqlite -$ sudo aptitude install sqlite sqlite3 libsqlite-dev libsqlite3-dev +* setup sqlite 3 +$ sudo aptitude install sqlite3 libsqlite3-dev # Note: there's some installation bugs with sqlite3-ruby 1.2.2 gem file permissions: # http://www.icoretech.org/2008/07/06/no-such-file-to-load-sqlite3-database # cd /usr/local/lib/ruby/gems/1.8/gems/sqlite3-ruby-1.2.2 && sudo find . -perm 0662 -exec chmod 664 {} \; diff --git a/ci/geminstaller.yml b/ci/geminstaller.yml index 5a6f9bde01..8dde704e79 100644 --- a/ci/geminstaller.yml +++ b/ci/geminstaller.yml @@ -11,16 +11,16 @@ gems: - name: mysql #version: >= 2.7 version: = 2.7 +- name: nokogiri + version: >= 1.3.3 - name: pg version: >= 0.8.0 - name: rack version: '~> 1.0.0' - name: rack-test - version: >= 0.4.2 + version: >= 0.5.0 - name: rake version: >= 0.8.1 -- name: sqlite-ruby - version: >= 2.2.3 - name: sqlite3-ruby version: >= 1.2.2 - name: rubygems-update |