Skip to content

Commit

Permalink
Fix minor issues in the worker recipe.
Browse files Browse the repository at this point in the history
  • Loading branch information
roidrage committed Mar 19, 2012
1 parent ba8c558 commit 117f675
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions worker_host/travis_worker/recipes/default.rb
Expand Up @@ -28,19 +28,19 @@
nohup_rvm = "source /usr/local/rvm/scripts/rvm && nohup rvm"

bash "bundle gems" do
code "#{rvm} 1.9.2 do bundle install --path vendor/bundle"

This comment has been minimized.

Copy link
@michaelklishin

michaelklishin Mar 19, 2012

Contributor

You may need both, unless Vagrant 1.0 now flawlessly works on JRuby. We still use 1.9.3 (on some machines, 1.9.2) to run vms:update today.

This comment has been minimized.

Copy link
@joshk

joshk Mar 19, 2012

Contributor

Seems to work perfectly, I haven't had any issues thus far.

code "#{rvm} jruby do bundle install --path vendor/bundle"
user "travis"
cwd node[:travis][:worker][:home]
end

bash "update VirtualBox images" do
code "#{rvm} jruby do bundle exec thor travis:worker:vms:update -r -d"
code "#{rvm} jruby do bundle exec thor travis:vms:update -r -d"
user "travis"
cwd node[:travis][:worker][:home]
end

bash "run Travis Worker" do
code "#{nohup_rvm} bundle exec thor travis:worker:boot > log/worker.log &"
user travis
user "travis"
cwd node[:travis][:worker][:home]
end

0 comments on commit 117f675

Please sign in to comment.