mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-21 23:33:07 +00:00
Code Issues Releases Wiki Activity

vagrant: darwin -> macos

Browse source 
Also: add macOS version number.
This commit is contained in:
Thomas Waldmann 2024-07-03 13:57:56 +02:00
parent 445dd69eba
commit f4367d66d8
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Vagrantfile vendored
View file

@ -106,7 +106,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
@ -155,7 +155,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
@ -389,7 +389,7 @@ Vagrant.configure(2) do |config|
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("netbsd", ".*fuse.*")
end
config.vm.define "darwin" do |b|
config.vm.define "macos1012" do |b|
b.vm.box = "macos-sierra"
b.vm.provider :virtualbox do |v|
v.memory = 4096 + $wmem
@ -404,15 +404,15 @@ 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("darwin")
b.vm.provision "fix pyenv", :type => :shell, :privileged => false, :inline => fix_pyenv_darwin("darwin")
b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("darwin")
b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("darwin")
b.vm.provision "packages macos", :type => :shell, :privileged => false, :inline => packages_macos
b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("macos")
b.vm.provision "fix pyenv", :type => :shell, :privileged => false, :inline => fix_pyenv_macos("macos")
b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("macos")
b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("macos")
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("darwin")
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("darwin", ".*(fuse3|none).*")
b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("macos")
b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("macos", ".*(fuse3|none).*")
end
# rsync on openindiana has troubles, does not set correct owner for /vagrant/borg and thus gives lots of

2
scripts/fetch-binaries
View file

@ -19,4 +19,4 @@ check_and_copy bookworm borg-linux-glibc236
check_and_copy freebsd13 borg-freebsd13
check_and_copy freebsd14 borg-freebsd14
check_and_copy darwin borg-macos
check_and_copy macos1012 borg-macos1012