From bf954f3e6a41b98d91864d32814a1d27d26d4e22 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 3 Sep 2011 21:52:57 -0700 Subject: [PATCH] Need to rebundle if we switch the Gemfile for postgres --- config/ci/before-travis.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/ci/before-travis.sh b/config/ci/before-travis.sh index 7d300bda6..11af8c391 100755 --- a/config/ci/before-travis.sh +++ b/config/ci/before-travis.sh @@ -2,9 +2,10 @@ echo $DB ruby -e "system('cp config/ci/Gemfile.postgresql Gemfile') if ENV['DB'] == 'postgres'" -# Remove Gemfile.lock and rebundle on Ruby 1.9 +# Remove Gemfile.lock if we're on Ruby 1.9 ruby -e "system('rm Gemfile.lock') if RUBY_VERSION.include?('1.9')" -ruby -e "system('bundle install --without development production') if RUBY_VERSION.include?('1.9')" +# Re-bundle if we're on Ruby 1.9 or postgres +ruby -e "system('bundle install --without development production') if RUBY_VERSION.include?('1.9') || ENV['DB'] == 'postgres'" # Create a database.yml for the right database cp config/database.yml.example config/database.yml