Commit 2bab7759 authored by Sarah Mei's avatar Sarah Mei

ci.sh uses @diaspora gemset and forces removal of Gemfile.lock

parent d98b5514
......@@ -4,9 +4,9 @@ echo "**************************************************************************
echo "* ruby 1.8.7-p249 build *" &&
echo "*************************************************************************************************" &&
echo "" &&
rm Gemfile.lock &&
rm -f Gemfile.lock &&
source /usr/local/rvm/scripts/rvm &&
rvm use ruby-1.8.7-p249 &&
rvm use ruby-1.8.7-p249@diaspora &&
bundle install &&
bundle exec rake cruise &&
echo "" &&
......@@ -14,8 +14,8 @@ echo "**************************************************************************
echo "* ruby 1.9.2-p0 build *" &&
echo "*************************************************************************************************" &&
echo "" &&
rm Gemfile.lock &&
rm -f Gemfile.lock &&
source /usr/local/rvm/scripts/rvm &&
rvm use ruby-1.9.2-p0 &&
rvm use ruby-1.9.2-p0@diaspora &&
bundle install &&
bundle exec rake cruise
require 'fileutils'
Project.configure do |project|
project.build_command = 'ci.sh'
project.build_command = './ci.sh'
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment