Author: donaldp
Date: Sun Oct 7 22:04:10 2012
New Revision: 1395392
URL: http://svn.apache.org/viewvc?rev=1395392&view=rev
Log:
Remove the code that attempted to auto-install rvm. WIll just jump on box and
install by hand.
Modified:
buildr/trunk/ci.sh
Modified: buildr/trunk/ci.sh
URL:
http://svn.apache.org/viewvc/buildr/trunk/ci.sh?rev=1395392&r1=1395391&r2=1395392&view=diff
==============================================================================
--- buildr/trunk/ci.sh (original)
+++ buildr/trunk/ci.sh Sun Oct 7 22:04:10 2012
@@ -42,70 +42,6 @@ else
export BUILDR_RUBY_VERSION=ruby-1.9.3-p194
fi
-function __sig_exit {
- echo "Cleaing up locks"
- rm -rf mkdir "$HOME/.rvm_lock"
-}
-
-function __sig_int {
- echo "WARNING: SIGINT caught"
- exit 1002
-}
-
-function __sig_quit {
- echo "SIGQUIT caught"
- exit 1003
-}
-
-function __sig_term {
- echo "WARNING: SIGTERM caught"
- exit 1015
-}
-
-function __sig_noop {
- true
-}
-
-while ! `mkdir "$HOME/.rvm_lock" 2>&1 > /dev/null`; do
- echo "Waiting"
- sleep 1
-done
-
-trap __sig_exit EXIT # SIGEXIT
-trap __sig_int INT # SIGINT
-trap __sig_quit QUIT # SIGQUIT
-trap __sig_term TERM # SIGTERM
-
-export BUILDR_GEMSET=${BUILDR_GEMSET-CI_$BUILD_JVM}
-export PATH=$JAVA_HOME/bin:$PATH
-export PATH=$PATH:$HOME/.rvm/bin
-
-export EXPECTED_RVM=random_value2
-export CURRENT_RVM=`cat "$HOME/.rvm_install" 2>&1`
-if [ "X$CURRENT_RVM" != "X$EXPECTED_RVM" ]; then
- echo Removing old RVM version
- rm -rf "$HOME/.rvm"
-fi
-
-if [[ ! -s "$HOME/.rvm/scripts/rvm" ]]; then
- curl -L https://get.rvm.io | bash -s stable --auto
- echo $EXPECTED_RVM > "$HOME/.rvm_install"
- touch "$HOME/.rvm_ci_update"
-else
- if test `find "$HOME/.rvm_ci_update" -mmin +7200 2>&1 > /dev/null`; then
- source "$HOME/.rvm/scripts/rvm"
- rvm get stable --auto
- touch "$HOME/.rvm_ci_update"
- fi
-fi
-
-rmdir "$HOME/.rvm_lock"
-
-trap __sig_noop EXIT # SIGEXIT
-trap __sig_noop INT # SIGINT
-trap __sig_noop QUIT # SIGQUIT
-trap __sig_noop TERM # SIGTERM
-
source "$HOME/.rvm/scripts/rvm"
rvm ${BUILDR_RUBY_VERSION} --force gemset delete ${BUILDR_GEMSET} 2>&1 >
/dev/null
