From c08d2092f6eccd9bced715786568c9cb0eedd10b Mon Sep 17 00:00:00 2001 From: Patrick Connolly Date: Wed, 27 Aug 2014 11:35:31 -0300 Subject: [PATCH] Update Vagrantfile and docs to clarify v1.4.3 is ok. --- docs/fdroid.texi | 3 +-- makebuildserver | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/fdroid.texi b/docs/fdroid.texi index 7657f7f3..c25fc1a1 100644 --- a/docs/fdroid.texi +++ b/docs/fdroid.texi @@ -113,8 +113,7 @@ VirtualBox (debian package virtualbox) @item Ruby (debian packages ruby and rubygems) @item -Vagrant (unpackaged) Be sure to use 1.3.x because 1.4.x is completely broken -(at the time of writing, the forthcoming 1.4.3 might work) +Vagrant (unpackaged, tested on v1.4.3) @item Paramiko (debian package python-paramiko) @item diff --git a/makebuildserver b/makebuildserver index 7bf0e14d..44efef29 100755 --- a/makebuildserver +++ b/makebuildserver @@ -144,12 +144,14 @@ for f, src, shasum in cachefiles: # Generate an appropriate Vagrantfile for the buildserver, based on our # settings... vagrantfile = """ -Vagrant::Config.run do |config| +Vagrant.configure("2") do |config| config.vm.box = "{0}" config.vm.box_url = "{1}" - config.vm.customize ["modifyvm", :id, "--memory", "{2}"] + config.vm.provider "virtualbox" do |v| + v.customize ["modifyvm", :id, "--memory", "{2}"] + end config.vm.provision :shell, :path => "fixpaths.sh" """.format(config['basebox'], config['baseboxurl'], config['memory']) -- 2.30.2