aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-06-30 08:26:25 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2011-06-30 08:26:25 -0300
commit452922a3594a7d1524d3ff76adac0179984b4473 (patch)
tree90c9cc5e1ef2b962cbae2106f05ae6f96906759e /ci
parentf34f0b7e0832a1910ab9c71080e024c8e36504b2 (diff)
downloadrails-452922a3594a7d1524d3ff76adac0179984b4473.tar.gz
rails-452922a3594a7d1524d3ff76adac0179984b4473.tar.bz2
rails-452922a3594a7d1524d3ff76adac0179984b4473.zip
Update CI config
Diffstat (limited to 'ci')
-rw-r--r--ci/cruise_config.rb12
-rw-r--r--ci/site_config.rb6
2 files changed, 9 insertions, 9 deletions
diff --git a/ci/cruise_config.rb b/ci/cruise_config.rb
index 9c7fa98a70..dd5b638c17 100644
--- a/ci/cruise_config.rb
+++ b/ci/cruise_config.rb
@@ -1,9 +1,9 @@
Project.configure do |project|
- # 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 1.6.2 && ruby ci/ci_build.rb'
+ project.email_notifier.from = 'rails-ci@wyeworks.com'
- project.build_command = 'sudo gem update --system && ruby ci/ci_build.rb'
- project.email_notifier.from = 'thewoolleyman@gmail.com'
+ # project.campfire_notifier.account = 'rails'
+ # project.campfire_notifier.token = ''
+ # project.campfire_notifier.room = 'Rails 3'
+ # project.campfire_notifier.ssl = true
end
diff --git a/ci/site_config.rb b/ci/site_config.rb
index 09d5b550e8..f9db39ed57 100644
--- a/ci/site_config.rb
+++ b/ci/site_config.rb
@@ -45,16 +45,16 @@ Configuration.dashboard_refresh_interval = 60.seconds
# Site-wide setting for the email "from" field. This can also be set on per-project basis,
# through project.email.notifier.from attribute
-Configuration.email_from = 'thewoolleyman+railsci@gmail.com'
+Configuration.email_from = 'rails-ci@wyeworks.com'
# Root URL of the dashboard application. Setting this attribute allows various notifiers to include a link to the
# build page in the notification message.
-Configuration.dashboard_url = 'http://ci.rubyonrails.org/'
+Configuration.dashboard_url = 'http://rails-ci.wyeworks.com/'
# If you don't want to allow triggering builds through dashboard Build Now button. Useful when you host CC.rb as a
# public web site (such as http://cruisecontrolrb.thoughtworks.com/projects - try clicking on Build Now button there
# and see what happens):
-# Configuration.disable_build_now = true
+Configuration.disable_build_now = true
# If you want to only allow one project to build at a time, uncomment this line
# by default, cruise allows multiple projects to build at a time