Skip to content

Commit

Permalink
[vagrant provisioning] make git call the last one (#4508)
Browse files Browse the repository at this point in the history
Fix #4507
  • Loading branch information
Val authored and bcardiff committed Jun 25, 2017
1 parent bbe0372 commit 7961a13
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

clone_crystal_from_vagrant = lambda do |config|
config.vm.provision :shell, privileged: false, inline: %(
git clone /vagrant crystal
)
end

Vagrant.configure("2") do |config|
%w(precise trusty xenial).product([32, 64]).each do |dist, bits|
box_name = "#{dist}#{bits}"
Expand All @@ -15,6 +21,8 @@ Vagrant.configure("2") do |config|
echo 'export LIBRARY_PATH="/opt/crystal/embedded/lib"' > /etc/profile.d/crystal.sh
echo 'export PATH="$PATH:/opt/llvm-3.5.0-1/bin"' >> /etc/profile.d/crystal.sh
)

clone_crystal_from_vagrant.call(c)
end
end

Expand All @@ -33,14 +41,12 @@ Vagrant.configure("2") do |config|
c.vm.provision :shell, inline: %(
pkg install -y git gmake pkgconf pcre libunwind clang36 libyaml gmp libevent2
)

clone_crystal_from_vagrant.call(c)
end

config.vm.provider "virtualbox" do |vb|
vb.memory = 4096
vb.cpus = 2
end

config.vm.provision :shell, privileged: false, inline: %(
git clone /vagrant crystal
)
end

0 comments on commit 7961a13

Please sign in to comment.