From 913aeaef818ca7729064c60bf0a877afbb156d61 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sun, 11 Jul 2010 18:02:49 -0300 Subject: We need to wait for the final release of bundler for this to make sense --- ci/ci_build.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ci') diff --git a/ci/ci_build.rb b/ci/ci_build.rb index ee6c357519..17f4ba5d51 100755 --- a/ci/ci_build.rb +++ b/ci/ci_build.rb @@ -19,9 +19,9 @@ puts "[CruiseControl] Rails build" build_results = {} # Install required version of bundler. -bundler_install_cmd = "gem install bundler --no-ri --no-rdoc" -puts "Running command: #{bundler_install_cmd}" -build_results[:install_bundler] = system bundler_install_cmd +#bundler_install_cmd = "gem install bundler --no-ri --no-rdoc" +#puts "Running command: #{bundler_install_cmd}" +#build_results[:install_bundler] = system bundler_install_cmd cd root_dir do puts -- cgit v1.2.3 From 2b22d1240be90a75c3f35b7a774d5efc9c4ac68f Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Tue, 13 Jul 2010 14:26:26 -0300 Subject: Makes CI builder install --pre version of Bundler, now that bundle install works again --- ci/ci_build.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ci') diff --git a/ci/ci_build.rb b/ci/ci_build.rb index 17f4ba5d51..0a39aa4f87 100755 --- a/ci/ci_build.rb +++ b/ci/ci_build.rb @@ -19,9 +19,9 @@ puts "[CruiseControl] Rails build" build_results = {} # Install required version of bundler. -#bundler_install_cmd = "gem install bundler --no-ri --no-rdoc" -#puts "Running command: #{bundler_install_cmd}" -#build_results[:install_bundler] = system bundler_install_cmd +bundler_install_cmd = "sudo gem install bundler --pre --no-ri --no-rdoc" +puts "Running command: #{bundler_install_cmd}" +build_results[:install_bundler] = system bundler_install_cmd cd root_dir do puts -- cgit v1.2.3 From ea0bf4e664ca6faf7323d3e2a241b6e6d0b86430 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Fri, 16 Jul 2010 05:36:49 +0800 Subject: CI should bundle update instead of install so gems are properly updated --- ci/ci_build.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/ci_build.rb b/ci/ci_build.rb index 0a39aa4f87..f9933cb922 100755 --- a/ci/ci_build.rb +++ b/ci/ci_build.rb @@ -27,7 +27,7 @@ cd root_dir do puts puts "[CruiseControl] Bundling RubyGems" puts - build_results[:bundle] = system 'rm -rf ~/.bundle; env CI=1 bundle install' + build_results[:bundle] = system 'rm -rf ~/.bundle; env CI=1 bundle update' end cd "#{root_dir}/activesupport" do -- cgit v1.2.3