aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-05-19 19:37:36 -0300
committerEmilio Tagua <miloops@gmail.com>2009-05-19 19:37:36 -0300
commitaa5512299041efb923cd582fd26009a72b9ec670 (patch)
tree4ba3cd70b4988293b99a89b72f0dbb177426a9f0 /ci
parent1cc44599397e061901cd59233397129625839a60 (diff)
parentd8fffe7b23acce42bc3941d7bba47e07a66aed67 (diff)
downloadrails-aa5512299041efb923cd582fd26009a72b9ec670.tar.gz
rails-aa5512299041efb923cd582fd26009a72b9ec670.tar.bz2
rails-aa5512299041efb923cd582fd26009a72b9ec670.zip
Merge commit 'rails/master'
Diffstat (limited to 'ci')
-rw-r--r--ci/ci_setup_notes.txt2
-rw-r--r--ci/cruise_config.rb2
-rw-r--r--ci/geminstaller.yml2
3 files changed, 4 insertions, 2 deletions
diff --git a/ci/ci_setup_notes.txt b/ci/ci_setup_notes.txt
index 63f1851b19..780277c939 100644
--- a/ci/ci_setup_notes.txt
+++ b/ci/ci_setup_notes.txt
@@ -47,7 +47,7 @@ $ sudo aptitude update
* If you did not configure no-root-gem installation via ~/.gemrc as shown above, then allow no-password sudo for gem installation:
$ sudo visudo
# add this line to bottom:
-ci ALL=NOPASSWD: /usr/local/bin/geminstaller, /usr/local/bin/ruby, /usr/local/bin/gem
+ci ALL=(ALL) NOPASSWD: ALL
* Start ccrb via init script and check for default homepage at port 3333
diff --git a/ci/cruise_config.rb b/ci/cruise_config.rb
index 7985e3c8df..2247a1b6ea 100644
--- a/ci/cruise_config.rb
+++ b/ci/cruise_config.rb
@@ -1,5 +1,5 @@
Project.configure do |project|
- project.build_command = 'ruby ci/ci_build.rb'
+ 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'
diff --git a/ci/geminstaller.yml b/ci/geminstaller.yml
index 387e370a6f..f1ef9b59a0 100644
--- a/ci/geminstaller.yml
+++ b/ci/geminstaller.yml
@@ -21,3 +21,5 @@ gems:
version: >= 2.2.3
- name: sqlite3-ruby
version: >= 1.2.2
+- name: rubygems-update
+ version: >= 1.3.3