From 546401cbecb81bd151a2f874833b717c3b4d6ef0 Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Mon, 11 Oct 2010 22:37:58 -0700
Subject: [PATCH] Gemfile.lock is different in 1.9.2, so we need to remove it
 after running specs so the next pull succeeds.

---
 ci.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ci.sh b/ci.sh
index 63bab3bcfe..e631517e16 100755
--- a/ci.sh
+++ b/ci.sh
@@ -4,10 +4,17 @@ echo "**************************************************************************
 echo "*                                  ruby 1.8.7-p249 build                                        *" &&
 echo "*************************************************************************************************" &&
 echo "" &&
-source /usr/local/rvm/scripts/rvm && rvm use ruby-1.8.7-p249 && bundle install && bundle exec rake ci &&
+source /usr/local/rvm/scripts/rvm &&
+rvm use ruby-1.8.7-p249 &&
+bundle install &&
+bundle exec rake ci &&
 echo "" &&
 echo "*************************************************************************************************" &&
 echo "*                                   ruby 1.9.2-p0 build                                         *" &&
 echo "*************************************************************************************************" &&
 echo "" &&
-source /usr/local/rvm/scripts/rvm && rvm use ruby-1.9.2-p0 && bundle install && bundle exec rake ci
\ No newline at end of file
+source /usr/local/rvm/scripts/rvm &&
+rvm use ruby-1.9.2-p0 &&
+bundle install &&
+bundle exec rake ci &&
+rm Gemfile.lock
\ No newline at end of file
-- 
GitLab