Author: donaldp
Date: Mon Oct 1 00:04:26 2012
New Revision: 1392137
URL: http://svn.apache.org/viewvc?rev=1392137&view=rev
Log:
Remove the CI specific code from .rvmrc
Modified:
buildr/trunk/.rvmrc
Modified: buildr/trunk/.rvmrc
URL:
http://svn.apache.org/viewvc/buildr/trunk/.rvmrc?rev=1392137&r1=1392136&r2=1392137&view=diff
==============================================================================
--- buildr/trunk/.rvmrc (original)
+++ buildr/trunk/.rvmrc Mon Oct 1 00:04:26 2012
@@ -13,7 +13,7 @@ EOF
export BUILDR_RUBY_VERSION="${BUILDR_RUBY_VERSION:-ruby-1.9.2-p320}"
project_dir=`pwd`
-export BUILDR_GEMSET=${JOB_NAME-`basename "$project_dir"`}
+export BUILDR_GEMSET=${BUILDR_GEMSET-`basename "$project_dir"`}
detected_version=`rvm list strings | grep ${BUILDR_RUBY_VERSION}`
if [ "X" == "X${detected_version}" ]; then
@@ -21,13 +21,6 @@ if [ "X" == "X${detected_version}" ]; th
rvm install ${BUILDR_RUBY_VERSION}
fi
-# If running in the ci then remove the existing gemset
-if [ "X" != "X$JENKINS_HOME" ]; then
- rvm ${BUILDR_RUBY_VERSION} --force gemset delete ${BUILDR_GEMSET}
-fi
-
-# rvm ${BUILDR_RUBY_VERSION} --force gemset create ${BUILDR_GEMSET}
-
# Force the creation of the gemset
rvm use "${BUILDR_RUBY_VERSION}@${BUILDR_GEMSET}" --create
@@ -43,7 +36,3 @@ if [ -f Gemfile ]; then
rm -f Gemfile.lock
rvm "${BUILDR_RUBY_VERSION}@${BUILDR_GEMSET}" exec bundle install
--no-binstubs
fi
-
-if [ ! -z "$PS1" ]; then
- rvm use "${BUILDR_RUBY_VERSION}@${BUILDR_GEMSET}"
-fi
\ No newline at end of file
