Browse Source

Vagrantfile: move to use Ubuntu Jammy for Vagrant builds

QGC4.4
Peter Barker 2 years ago committed by Philipp Borgers
parent
commit
1564399cf8
  1. 5
      Vagrantfile

5
Vagrantfile vendored

@ -11,7 +11,6 @@ env_global = [
'JOBS=4', 'JOBS=4',
'SHADOW_BUILD_DIR=/tmp/shadow_build_dir', 'SHADOW_BUILD_DIR=/tmp/shadow_build_dir',
'CODESIGN=nocodesign', 'CODESIGN=nocodesign',
'secure: RGovyUnMw3fp/bHZi058JvANT1rYmNqrsuSYew0cIgirO6YbMHr/rsjwCm1FTYpBl8s1zgr+u2b8ftYnfnCz2YT+Aip4NWrVYpVU0FEmfytGILrnUS0pjlt8m7fU9AKR1ElOSll7yw7e1kftynN39Q321etvwbLZcXon6zz0suE='
] ]
packages = [ packages = [
@ -33,7 +32,7 @@ Vagrant.configure(2) do |config|
config.vm.provider "virtualbox" config.vm.provider "virtualbox"
config.vm.provider "vmware_fusion" config.vm.provider "vmware_fusion"
config.vm.box = "ubuntu/bionic64" config.vm.box = "ubuntu/jammy64"
config.vm.provider :docker do |docker, override| config.vm.provider :docker do |docker, override|
override.vm.box = "tknerr/baseimage-ubuntu-16.04" override.vm.box = "tknerr/baseimage-ubuntu-16.04"
end end
@ -93,6 +92,8 @@ Vagrant.configure(2) do |config|
su - vagrant -c "mkdir -p ${dir}" su - vagrant -c "mkdir -p ${dir}"
su - vagrant -c "python3 -m aqt install-qt -O ${dir} ${host} ${target} ${version} -m ${modules}" su - vagrant -c "python3 -m aqt install-qt -O ${dir} ${host} ${target} ${version} -m ${modules}"
mkdir -p /vagrant/shadow-build
# write out a pair of scripts to make rebuilding on the VM easy: # write out a pair of scripts to make rebuilding on the VM easy:
su - vagrant -c "cat <<QMAKE >do-qmake.sh su - vagrant -c "cat <<QMAKE >do-qmake.sh
#!/bin/bash #!/bin/bash

Loading…
Cancel
Save