Skip to content

Commit b3b3431

Browse files
committed
FIX: Update vagrant box for ruby and phantomjs versions
These updates are needed to successfully run tests on the vagrant box.
1 parent c681b35 commit b3b3431

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

Vagrantfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# See https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md
44
#
55
Vagrant.configure("2") do |config|
6-
config.vm.box = 'discourse-0.9.9.13'
7-
config.vm.box_url = "https://d3fvb7b7auiut8.cloudfront.net/discourse-0.9.9.13.box"
6+
config.vm.box= "edgibbs/discourse-0.9.9.15.box"
7+
config.vm.box_url = "https://vagrantcloud.com/edgibbs/discourse-0.9.9.15.box"
88

99
# Make this VM reachable on the host network as well, so that other
1010
# VM's running other browsers can access our dev server.
+26-26
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
execute "upgrade-rvm" do
2-
command "gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"
3-
command "rvm get stable && rvm reload"
4-
action :nothing
5-
end
6-
7-
execute "upgrade-ruby" do
8-
command "yes | rvm install ruby-2.1.5 --verify-downloads 1"
9-
action :nothing
10-
end
11-
12-
execute "set-ruby" do
13-
command "rvm use ruby-2.1.5"
14-
user "vagrant"
15-
action :nothing
16-
end
17-
18-
ruby_block "ruby-upgrade-message" do
19-
block do
20-
Chef::Log.info "Upgrading ruby. This will take a while."
21-
end
22-
notifies :run, "execute[upgrade-rvm]", :immediately
23-
notifies :run, "execute[upgrade-ruby]", :immediately
24-
notifies :run, "execute[set-ruby]", :immediately
25-
action :create
26-
end
1+
# execute "upgrade-rvm" do
2+
# command "gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"
3+
# command "rvm get stable && rvm reload"
4+
# action :nothing
5+
# end
6+
#
7+
# execute "upgrade-ruby" do
8+
# command "yes | rvm install ruby-2.1.5 --verify-downloads 1"
9+
# action :nothing
10+
# end
11+
#
12+
# execute "set-ruby" do
13+
# command "rvm use ruby-2.1.5"
14+
# user "vagrant"
15+
# action :nothing
16+
# end
17+
#
18+
# ruby_block "ruby-upgrade-message" do
19+
# block do
20+
# Chef::Log.info "Upgrading ruby. This will take a while."
21+
# end
22+
# notifies :run, "execute[upgrade-rvm]", :immediately
23+
# notifies :run, "execute[upgrade-ruby]", :immediately
24+
# notifies :run, "execute[set-ruby]", :immediately
25+
# action :create
26+
# end

0 commit comments

Comments
 (0)