aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-10 17:13:43 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-10 17:13:43 -0800
commit486a63c258c7eff44ece0dbfbca4e6a08eeb01a0 (patch)
treea77b0a36d04b32094d67b3e01367193fc7341f21
parent1ac8e0662fbf4e14570ad8ec490fd4cece15bbe4 (diff)
downloadrails-486a63c258c7eff44ece0dbfbca4e6a08eeb01a0.tar.gz
rails-486a63c258c7eff44ece0dbfbca4e6a08eeb01a0.tar.bz2
rails-486a63c258c7eff44ece0dbfbca4e6a08eeb01a0.zip
CI: short-circuit at first failing task. Chmod 755 bin, vendor, vendor/gems
-rwxr-xr-xci/ci_build.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index 12b1f6b955..1b8a880a2f 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -7,9 +7,8 @@ def root_dir
end
def rake(*tasks)
- result = nil
- tasks.each { |task| result = system("#{root_dir}/bin/rake", task) }
- result
+ tasks.each { |task| return false unless system("#{root_dir}/bin/rake", task) }
+ true
end
puts "[CruiseControl] Rails build"
@@ -27,7 +26,7 @@ cd root_dir do
puts
puts "[CruiseControl] Bundling RubyGems"
puts
- build_results[:bundle] = system 'rm -rf vendor && env CI=1 gem bundle --update && chmod 755 bin'
+ build_results[:bundle] = system 'rm -rf vendor && env CI=1 gem bundle --update && chmod 755 bin vendor vendor/gems'
end
cd "#{root_dir}/activesupport" do