Permalink
Browse files

fixes for rvm + cruise

  • Loading branch information...
1 parent 9bc454f commit f825290be6345455b57e1a90a3931f44e08f6744 @thewoolleyman thewoolleyman committed Jan 19, 2011
Showing with 3 additions and 9 deletions.
  1. +0 −4 Gemfile.lock
  2. +2 −4 cruise_build_command.sh
  3. +1 −1 cruise_config.rb
View
@@ -51,11 +51,7 @@ GEM
rest-client (>= 1.5.0)
selenium-client (>= 1.2.17)
selenium-client (1.2.18)
-<<<<<<< HEAD
- webrat (0.6.0)
-=======
webrat (0.7.3)
->>>>>>> cleanup and updates, test-unit and rspec working against latest master of saucelabs-adapter
nokogiri (>= 1.2.0)
rack (>= 1.0)
rack-test (>= 0.5.3)
View
@@ -1,6 +1,4 @@
#!/usr/bin/env bash
-source $HOME/.rvm/environments/1.8.7-p299@saucelabs-canary # have to hardcode env to match the one in .rvmrc
-source .rvmrc
export IS_CI_BOX=true
-rvm exec bundle install
-rvm exec rake $@
+bundle install
+rake selenium:ci
View
@@ -12,7 +12,7 @@
# Build the project by invoking rake task 'custom'
ENV['SAUCELABS_JOB_NAME'] = "Saucelabs Canary"
- project.build_command = './cruise_build_command.sh selenium:ci'
+ project.build_command = 'rvm-shell ree-1.8.7-2010.02@saucelabs-canary ./cruise_build_command.sh'
# Build the project by invoking shell script "build_my_app.sh". Keep in mind that when the script is invoked,
# current working directory is <em>[cruise&nbsp;data]</em>/projects/your_project/work, so if you do not keep build_my_app.sh

0 comments on commit f825290

Please sign in to comment.