diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-08-31 22:11:50 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-08-31 22:11:50 +0100 |
| commit | bae00bb1cc392e1cf408369809b9cf85468bef42 (patch) | |
| tree | 17103af6eeb5de96c72beda1debce28950cc7fea /ci | |
| parent | 93c76b2fb08668bc4b8364cc8051476e6d1d15ba (diff) | |
| parent | ffd2cf167040b60c26d97c01598560c87bd4b2d3 (diff) | |
| download | rails-bae00bb1cc392e1cf408369809b9cf85468bef42.tar.gz rails-bae00bb1cc392e1cf408369809b9cf85468bef42.tar.bz2 rails-bae00bb1cc392e1cf408369809b9cf85468bef42.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/ci_build.rb | 12 | ||||
| -rw-r--r-- | ci/ci_setup_notes.txt | 4 | ||||
| -rw-r--r-- | ci/cruise_config.rb | 11 | ||||
| -rw-r--r-- | ci/geminstaller.yml | 4 |
4 files changed, 14 insertions, 17 deletions
diff --git a/ci/ci_build.rb b/ci/ci_build.rb index 0b9bd3d278..06e513f907 100755 --- a/ci/ci_build.rb +++ b/ci/ci_build.rb @@ -28,21 +28,14 @@ cd "#{root_dir}/activerecord" do puts puts "[CruiseControl] Building ActiveRecord with MySQL" puts - build_results[:activerecord_mysql] = system '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 'rake test_postgresql' -end - -cd "#{root_dir}/activerecord" do - puts - puts "[CruiseControl] Building ActiveRecord with SQLite 2" - puts - build_results[:activerecord_sqlite] = system 'rake test_sqlite' + build_results[:activerecord_postgresql8] = system 'rake postgresql:rebuild_databases && rake test_postgresql' end cd "#{root_dir}/activerecord" do @@ -96,7 +89,6 @@ puts "[CruiseControl] #{`uname -a`}" puts "[CruiseControl] #{`ruby -v`}" puts "[CruiseControl] #{`mysql --version`}" puts "[CruiseControl] #{`pg_config --version`}" -puts "[CruiseControl] SQLite2: #{`sqlite -version`}" puts "[CruiseControl] SQLite3: #{`sqlite3 -version`}" `gem env`.each_line {|line| print "[CruiseControl] #{line}"} puts "[CruiseControl] Local gems:" diff --git a/ci/ci_setup_notes.txt b/ci/ci_setup_notes.txt index 780277c939..7581a24672 100644 --- a/ci/ci_setup_notes.txt +++ b/ci/ci_setup_notes.txt @@ -17,9 +17,9 @@ root:*:14001:0:99999:7::: * Change Hostname: $ sudo vi /etc/hostname -change to 'ci' +change to correct hostname $ sudo vi /etc/hosts -replace old hostname with 'ci' +replace old hostname with the correct hostname # reboot to use new hostname (and test reboot) $ sudo shutdown -r now diff --git a/ci/cruise_config.rb b/ci/cruise_config.rb index 2247a1b6ea..9c7fa98a70 100644 --- a/ci/cruise_config.rb +++ b/ci/cruise_config.rb @@ -1,6 +1,9 @@ Project.configure do |project| - project.build_command = 'sudo update_rubygems && ruby ci/ci_build.rb' - project.email_notifier.emails = ['thewoolleyman@gmail.com'] -# project.email_notifier.emails = ['thewoolleyman@gmail.com','michael@koziarski.com', 'david@loudthinking.com', 'jeremy@bitsweat.net', 'josh@joshpeek.com', 'pratiknaik@gmail.com', 'wycats@gmail.com'] - project.email_notifier.from = 'thewoolleyman+railsci@gmail.com' + # Send email notifications about broken and fixed builds to core mailing list + if Socket.gethostname =~ /ci.rubyonrails.org/ && ENV['ENABLE_RAILS_CI_EMAILS'] == 'true' + project.email_notifier.emails = ['rubyonrails-core@googlegroups.com'] + end + + project.build_command = 'sudo gem update --system && ruby ci/ci_build.rb' + project.email_notifier.from = 'thewoolleyman@gmail.com' end diff --git a/ci/geminstaller.yml b/ci/geminstaller.yml index 59bdcebc26..3a4079ddbb 100644 --- a/ci/geminstaller.yml +++ b/ci/geminstaller.yml @@ -12,9 +12,11 @@ gems: #version: >= 2.7 version: = 2.7 - name: pg - version: >= 0.7.9.2008.10.13 + version: >= 0.8.0 - name: rack version: '~> 1.0.0' +- name: josh-rack-test + version: >= 0.4.1 - name: rake version: >= 0.8.1 - name: sqlite-ruby |