From f7d0cbeeed3dddb60aef93a604bcf24fcceb7945 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 30 Sep 2024 22:49:29 +0200 Subject: [PATCH 1/3] vagrant: use bento/ubuntu-24.04 for now --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 8bda0da3b..23b89535c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -279,7 +279,7 @@ Vagrant.configure(2) do |config| end config.vm.define "noble" do |b| - b.vm.box = "ubuntu/noble64" + b.vm.box = "bento/ubuntu-24.04" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem end From 0aed3cc2cbf1c67360ce73a3352c7e689e9ac817 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 2 Oct 2024 12:52:32 +0200 Subject: [PATCH 2/3] vagrant: macos: give more memory sometimes the VM just got stuck (usually when building/testing openssl 3), maybe more RAM helps? --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 23b89535c..c4070e635 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -395,7 +395,7 @@ Vagrant.configure(2) do |config| config.vm.define "macos1012" do |b| b.vm.box = "macos-sierra" b.vm.provider :virtualbox do |v| - v.memory = 4096 + $wmem + v.memory = 8192 + $wmem v.customize ['modifyvm', :id, '--ostype', 'MacOS_64'] v.customize ['modifyvm', :id, '--paravirtprovider', 'default'] v.customize ['modifyvm', :id, '--nested-hw-virt', 'on'] From e5fe1ddd00ecef48f195d968c992003243cc766c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 2 Oct 2024 12:53:43 +0200 Subject: [PATCH 3/3] vagrant: use Python 3.11.3 3.11.2 had a compile failure on macos1012. --- Vagrantfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index c4070e635..262f3ac4f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -169,7 +169,7 @@ def install_pythons(boxname) . ~/.bash_profile echo "PYTHON_CONFIGURE_OPTS: ${PYTHON_CONFIGURE_OPTS}" pyenv install 3.12.6 # tests, binary build - pyenv install 3.11.2 # tests + pyenv install 3.11.3 # tests pyenv install 3.10.2 # tests pyenv install 3.9.4 # tests pyenv rehash @@ -236,8 +236,8 @@ def run_tests(boxname, skip_env) . ../borg-env/bin/activate if which pyenv 2> /dev/null; then # for testing, use the earliest point releases of the supported python versions: - pyenv global 3.9.4 3.10.2 3.11.2 3.12.6 - pyenv local 3.9.4 3.10.2 3.11.2 3.12.6 + pyenv global 3.9.4 3.10.2 3.11.3 3.12.6 + pyenv local 3.9.4 3.10.2 3.11.3 3.12.6 fi # otherwise: just use the system python # some OSes can only run specific test envs, e.g. because they miss FUSE support: