diff --git a/Vagrantfile b/Vagrantfile index 6a0b98cdb8..23676e6619 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -105,7 +105,7 @@ def packages_netbsd EOF end -def packages_darwin +def packages_macos return <<-EOF # install all the (security and other) updates sudo softwareupdate --ignore iTunesX @@ -154,7 +154,7 @@ def install_pyenv(boxname) EOF end -def fix_pyenv_darwin(boxname) +def fix_pyenv_macos(boxname) return <<-EOF echo 'export PYTHON_CONFIGURE_OPTS="--enable-framework"' >> ~/.bash_profile EOF @@ -275,79 +275,96 @@ Vagrant.configure(2) do |config| v.cpus = $cpus end - config.vm.define "noble64" do |b| + config.vm.define "noble" do |b| b.vm.box = "ubuntu/noble64" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("noble64") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("noble") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("noble64", ".*none.*") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("noble", ".*none.*") end - config.vm.define "jammy64" do |b| + config.vm.define "jammy" do |b| b.vm.box = "ubuntu/jammy64" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("jammy64") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("jammy") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("jammy64", ".*none.*") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("jammy", ".*none.*") end - config.vm.define "bookworm64" do |b| + config.vm.define "bookworm" do |b| b.vm.box = "debian/bookworm64" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") - b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("bookworm64") - b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("bookworm64") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("bookworm64") + b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("bookworm") + b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("bookworm") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("bookworm") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller() - b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("bookworm64") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("bookworm64", ".*none.*") + b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("bookworm") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("bookworm", ".*none.*") end - config.vm.define "bullseye64" do |b| + config.vm.define "bullseye" do |b| b.vm.box = "debian/bullseye64" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") - b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("bullseye64") - b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("bullseye64") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("bullseye64") + b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("bullseye") + b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("bullseye") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("bullseye") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller() - b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("bullseye64") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("bullseye64", ".*none.*") + b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("bullseye") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("bullseye", ".*none.*") end - config.vm.define "buster64" do |b| + config.vm.define "buster" do |b| b.vm.box = "debian/buster64" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") - b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("buster64") - b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("buster64") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("buster64") + b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("buster") + b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("buster") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("buster") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller() - b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("buster64") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("buster64", ".*none.*") + b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("buster") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("buster", ".*none.*") end - config.vm.define "freebsd64" do |b| + config.vm.define "freebsd13" do |b| + b.vm.box = "generic/freebsd13" + b.vm.provider :virtualbox do |v| + v.memory = 1024 + $wmem + end + b.ssh.shell = "sh" + b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") + b.vm.provision "packages freebsd", :type => :shell, :inline => packages_freebsd + b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("freebsd13") + b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("freebsd13") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("freebsd13") + b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") + b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller() + b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("freebsd13") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("freebsd13", ".*(fuse3|none).*") + end + + config.vm.define "freebsd14" do |b| b.vm.box = "generic/freebsd14" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem @@ -355,40 +372,40 @@ Vagrant.configure(2) do |config| b.ssh.shell = "sh" b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages freebsd", :type => :shell, :inline => packages_freebsd - b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("freebsd64") - b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("freebsd64") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("freebsd64") + b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("freebsd14") + b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("freebsd14") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("freebsd14") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller() - b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("freebsd64") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("freebsd64", ".*(fuse3|none).*") + b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("freebsd14") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("freebsd14", ".*(fuse3|none).*") end - config.vm.define "openbsd64" do |b| + config.vm.define "openbsd7" do |b| b.vm.box = "generic/openbsd7" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages openbsd", :type => :shell, :inline => packages_openbsd - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("openbsd64") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("openbsd7") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("nofuse") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("openbsd64", ".*fuse.*") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("openbsd7", ".*fuse.*") end - config.vm.define "netbsd64" do |b| + config.vm.define "netbsd9" do |b| b.vm.box = "generic/netbsd9" b.vm.provider :virtualbox do |v| v.memory = 4096 + $wmem # need big /tmp tmpfs in RAM! end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages netbsd", :type => :shell, :inline => packages_netbsd - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("netbsd64") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("netbsd9") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg(false) - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("netbsd64", ".*fuse.*") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("netbsd9", ".*fuse.*") end - config.vm.define "darwin64" do |b| + config.vm.define "macos1012" do |b| b.vm.box = "macos-sierra" b.vm.provider :virtualbox do |v| v.memory = 4096 + $wmem @@ -403,28 +420,28 @@ Vagrant.configure(2) do |config| v.customize ["modifyvm", :id, '--usbehci', 'off', '--usbxhci', 'off'] end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") - b.vm.provision "packages darwin", :type => :shell, :privileged => false, :inline => packages_darwin - b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("darwin64") - b.vm.provision "fix pyenv", :type => :shell, :privileged => false, :inline => fix_pyenv_darwin("darwin64") - b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("darwin64") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("darwin64") + b.vm.provision "packages macos", :type => :shell, :privileged => false, :inline => packages_macos + b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("macos1012") + b.vm.provision "fix pyenv", :type => :shell, :privileged => false, :inline => fix_pyenv_macos("macos1012") + b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("macos1012") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("macos1012") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller() - b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("darwin64") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("darwin64", ".*(fuse3|none).*") + b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("macos1012") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("macos1012", ".*(fuse3|none).*") end # rsync on openindiana has troubles, does not set correct owner for /vagrant/borg and thus gives lots of # permission errors. can be manually fixed in the VM by: sudo chown -R vagrant /vagrant/borg ; then rsync again. - config.vm.define "openindiana64" do |b| + config.vm.define "openindiana" do |b| b.vm.box = "openindiana/hipster" b.vm.provider :virtualbox do |v| v.memory = 2048 + $wmem end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages openindiana", :type => :shell, :inline => packages_openindiana - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("openindiana64") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("openindiana") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("nofuse") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("openindiana64", ".*fuse.*") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("openindiana", ".*fuse.*") end end diff --git a/scripts/fetch-binaries b/scripts/fetch-binaries index a43448d14e..ef720c38e1 100755 --- a/scripts/fetch-binaries +++ b/scripts/fetch-binaries @@ -12,10 +12,11 @@ check_and_copy () { echo "" } -check_and_copy buster64 borg-linux-glibc228 -check_and_copy bullseye64 borg-linux-glibc231 -check_and_copy bookworm64 borg-linux-glibc236 +check_and_copy buster borg-linux-glibc228 +check_and_copy bullseye borg-linux-glibc231 +check_and_copy bookworm borg-linux-glibc236 -check_and_copy freebsd64 borg-freebsd +check_and_copy freebsd13 borg-freebsd13 +check_and_copy freebsd14 borg-freebsd14 -check_and_copy darwin64 borg-macos +check_and_copy macos1012 borg-macos1012