From 136e9cbdc409d55c3e90218a7c9042e8555ec5a6 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 30 Sep 2024 17:37:49 +0200 Subject: [PATCH 1/4] vagrant: install rust on *BSD --- Vagrantfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 23676e661..5b4ce606e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -42,6 +42,7 @@ def packages_freebsd pkg install -y liblz4 zstd pkgconf pkg install -y fusefs-libs || true pkg install -y fusefs-libs3 || true + pkg install -y rust pkg install -y git bash # fakeroot causes lots of troubles on freebsd # for building python (for the tests we use pyenv built pythons): pkg install -y python310 py310-sqlite3 @@ -76,6 +77,7 @@ def packages_openbsd pkg_add lz4 pkg_add zstd pkg_add git # no fakeroot + pkg_add rust pkg_add openssl%3.0 pkg_add py3-pip pkg_add py3-virtualenv @@ -88,6 +90,7 @@ def packages_netbsd pkgin update pkgin -y upgrade pkg_add zstd lz4 xxhash git + pkg_add rust pkg_add bash chsh -s bash vagrant echo "export PROMPT_COMMAND=" >> ~vagrant/.bash_profile # bug in netbsd 9.2, .bash_profile broken for screen From 58f8554b6d1df7696f05ae7ba7cde9994bc09c54 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 2 Oct 2024 12:52:32 +0200 Subject: [PATCH 2/4] 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 5b4ce606e..af0495ba0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -411,7 +411,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 3be57ca1f8266c7c41e3204f7267979a49469439 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 30 Sep 2024 22:49:29 +0200 Subject: [PATCH 3/4] vagrant: use bento/ubuntu-24.04 for now --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index af0495ba0..a951c177a 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 8d4f7a00e515c358b396e1f454f5f7113a33d151 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 28 Dec 2024 22:57:05 +0100 Subject: [PATCH 4/4] vagrant: use Python 3.11.11 for binary build --- Vagrantfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index a951c177a..a1d1cccb6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -167,7 +167,7 @@ def install_pythons(boxname) return <<-EOF . ~/.bash_profile pyenv install 3.12.0 # tests - pyenv install 3.11.9 # tests, binary build + pyenv install 3.11.11 # tests, binary build pyenv install 3.10.2 # tests pyenv install 3.9.4 # tests pyenv rehash @@ -187,8 +187,8 @@ def build_pyenv_venv(boxname) . ~/.bash_profile cd /vagrant/borg # use the latest 3.11 release - pyenv global 3.11.9 - pyenv virtualenv 3.11.9 borg-env + pyenv global 3.11.11 + pyenv virtualenv 3.11.11 borg-env ln -s ~/.pyenv/versions/borg-env . EOF end @@ -234,8 +234,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.9 3.12.0 - pyenv local 3.9.4 3.10.2 3.11.9 3.12.0 + pyenv global 3.9.4 3.10.2 3.11.11 3.12.0 + pyenv local 3.9.4 3.10.2 3.11.11 3.12.0 fi # otherwise: just use the system python # avoid that git complains about dubious ownership if we use fakeroot: