From cbbddcfa3a046157a26541a57bac7eb631148b5e Mon Sep 17 00:00:00 2001 From: Sake Blok Date: Sun, 18 Dec 2022 10:27:10 +0100 Subject: [PATCH] vagrant: Bump to Ubunutu 22.04, RAM to 8GB Ubuntu 18.04 did not have the right versions of some of the tools. 2GB of RAM did not cut it with the -j4 flag, memory use is now about 4-6 GB while compiling in 4 threads. --- Vagrantfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index de6d6fb738..7b76dc4aff 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -8,7 +8,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Bump the default resources as building is expensive config.vm.provider "virtualbox" do |v| - v.memory = 2048 + v.memory = 8096 v.cpus = 4 end @@ -22,11 +22,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Install and build the various things (including wireshark!) config.vm.define "ubuntu", autostart: false do |deb| - deb.vm.box = "ubuntu/bionic64" + deb.vm.box = "ubuntu/jammy64" deb.vm.provision "shell" do |s| s.path = 'tools/debian-setup.sh' - s.args = ['--install-optional', '--assume-yes'] + s.args = ['--install-optional', '--assume-yes', '--install-qt6-deps'] end deb.vm.provision :shell, inline: "apt-get -y install ccache" deb.vm.provision :shell, path: 'vagrant_build.sh', privileged: false