Remove the CI specific code from .rvmrc
authorPeter Donald <donaldp@apache.org>
Mon, 1 Oct 2012 00:04:26 +0000 (00:04 +0000)
committerPeter Donald <donaldp@apache.org>
Mon, 1 Oct 2012 00:04:26 +0000 (00:04 +0000)
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1392137 13f79535-47bb-0310-9956-ffa450edef68

.rvmrc

diff --git a/.rvmrc b/.rvmrc
index 4781aee..0051961 100644 (file)
--- a/.rvmrc
+++ b/.rvmrc
@@ -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}" ]; then
   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