mirror of
https://github.com/discourse/discourse.git
synced 2024-11-25 10:20:58 -06:00
FIX: Issue with Vagrant image failing specs.
Update chef recipe to use Ruby 2.1, since 2.0.0 was very buggy
This commit is contained in:
parent
e37f7d50ec
commit
e7c07d10c0
@ -1,42 +1,26 @@
|
||||
# Upgrade ruby. I don't know chef, so this is probably more complicated than it needs to be:
|
||||
# execute "upgrade-rvm" do
|
||||
# command "rvm get stable && rvm reload"
|
||||
# action :nothing
|
||||
# end
|
||||
execute "upgrade-rvm" do
|
||||
command "gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"
|
||||
command "rvm get stable && rvm reload"
|
||||
action :nothing
|
||||
end
|
||||
|
||||
# execute "upgrade-ruby" do
|
||||
# command "yes | rvm install 2.0.0-p247-turbo"
|
||||
# action :nothing
|
||||
# end
|
||||
execute "upgrade-ruby" do
|
||||
command "yes | rvm install ruby-2.1.5 --verify-downloads 1"
|
||||
action :nothing
|
||||
end
|
||||
|
||||
execute "set-ruby" do
|
||||
command "rvm use ruby-2.1.5"
|
||||
user "vagrant"
|
||||
action :nothing
|
||||
end
|
||||
|
||||
|
||||
# TODO: set-default-ruby SUCCEEDS BY DOES NOTHING. HOW TO GET THIS TO WORK??
|
||||
|
||||
# execute "set-default-ruby" do
|
||||
# command "rvm --default use ruby-2.0.0-p247-turbo"
|
||||
# user "vagrant"
|
||||
# action :nothing
|
||||
# end
|
||||
|
||||
|
||||
|
||||
|
||||
# execute "install-gems" do
|
||||
# command "gem install bundler && bundle install"
|
||||
# user "vagrant"
|
||||
# cwd "/vagrant"
|
||||
# action :nothing
|
||||
# end
|
||||
|
||||
# ruby_block "ruby-upgrade-message" do
|
||||
# block do
|
||||
# Chef::Log.info "Upgrading ruby. This will take a while."
|
||||
# end
|
||||
# only_if { `ruby -v`.include?('2.0.0p0') }
|
||||
# notifies :run, "execute[upgrade-rvm]", :immediately
|
||||
# notifies :run, "execute[upgrade-ruby]", :immediately
|
||||
# notifies :run, "execute[set-default-ruby]", :immediately
|
||||
# notifies :run, "execute[install-gems]", :immediately
|
||||
# action :create
|
||||
# end
|
||||
ruby_block "ruby-upgrade-message" do
|
||||
block do
|
||||
Chef::Log.info "Upgrading ruby. This will take a while."
|
||||
end
|
||||
notifies :run, "execute[upgrade-rvm]", :immediately
|
||||
notifies :run, "execute[upgrade-ruby]", :immediately
|
||||
notifies :run, "execute[set-ruby]", :immediately
|
||||
action :create
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user