1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-01 12:09:10 +00:00

Merge pull request #5544 from ThomasWaldmann/vagrant-updates4

Vagrant updates/fixes
This commit is contained in:
TW 2020-12-05 00:12:30 +01:00 committed by GitHub
commit 1b4e38bbcb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

8
Vagrantfile vendored
View file

@ -34,7 +34,7 @@ def packages_arch
locale-gen
localectl set-locale LANG=en_US.UTF-8
chown vagrant.vagrant /vagrant
pacman --sync --noconfirm --refresh python-virtualenv python-pip
pacman -Syu --noconfirm python-virtualenv python-pip
EOF
end
@ -258,7 +258,7 @@ Vagrant.configure(2) do |config|
b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant")
b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("focal64")
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("focal64", "^$")
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("focal64", ".*none.*")
end
config.vm.define "bionic64" do |b|
@ -286,7 +286,7 @@ Vagrant.configure(2) do |config|
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", "^$")
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("buster64", ".*none.*")
end
config.vm.define "stretch64" do |b|
@ -314,7 +314,7 @@ Vagrant.configure(2) do |config|
b.vm.provision "packages arch", :type => :shell, :privileged => true, :inline => packages_arch
b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("arch64")
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("arch64", "^$")
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("arch64", ".*none.*")
end
config.vm.define "freebsd64" do |b|

View file

@ -2,7 +2,7 @@
# fakeroot -u tox --recreate
[tox]
envlist = py{36,37,38,39}-fuse{2,3}
envlist = py{36,37,38,39}-{none,fuse2,fuse3}
[testenv]
deps =