diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-09-01 12:19:09 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-09-01 12:19:09 -0700 |
| commit | 016b1d3596ce12367edac8bb442f5c630a453ecf (patch) | |
| tree | 49435918ebb372f617c3cc95bc495f6dd5c12d24 /ci | |
| parent | 22d5e3d89d619acb9179dfcdd33f1afaee9567ca (diff) | |
| parent | da636809daca9c338200811d3590e446f57c8e81 (diff) | |
| download | rails-016b1d3596ce12367edac8bb442f5c630a453ecf.tar.gz rails-016b1d3596ce12367edac8bb442f5c630a453ecf.tar.bz2 rails-016b1d3596ce12367edac8bb442f5c630a453ecf.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/ci_setup_notes.txt | 4 | ||||
| -rw-r--r-- | ci/cruise_config.rb | 11 | ||||
| -rw-r--r-- | ci/geminstaller.yml | 2 |
3 files changed, 11 insertions, 6 deletions
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 fad9e7d786..5a6f9bde01 100644 --- a/ci/geminstaller.yml +++ b/ci/geminstaller.yml @@ -15,6 +15,8 @@ gems: version: >= 0.8.0 - name: rack version: '~> 1.0.0' +- name: rack-test + version: >= 0.4.2 - name: rake version: >= 0.8.1 - name: sqlite-ruby |