mirror of
https://github.com/borgbackup/borg.git
synced 2025-03-10 06:03:38 +00:00
Merge pull request #7784 from ThomasWaldmann/vagrant-updates-1.2
Vagrant updates (1.2-maint)
This commit is contained in:
commit
8ae06199ef
1 changed files with 6 additions and 7 deletions
13
Vagrantfile
vendored
13
Vagrantfile
vendored
|
@ -82,8 +82,7 @@ end
|
||||||
|
|
||||||
def packages_netbsd
|
def packages_netbsd
|
||||||
return <<-EOF
|
return <<-EOF
|
||||||
# use the latest stuff, some packages in "9.2" are quite broken
|
echo 'http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$arch/9.3/All' > /usr/pkg/etc/pkgin/repositories.conf
|
||||||
echo 'http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$arch/9.0_current/All' > /usr/pkg/etc/pkgin/repositories.conf
|
|
||||||
pkgin update
|
pkgin update
|
||||||
pkgin -y upgrade
|
pkgin -y upgrade
|
||||||
pkg_add zstd lz4 xxhash git
|
pkg_add zstd lz4 xxhash git
|
||||||
|
@ -161,7 +160,7 @@ def install_pythons(boxname)
|
||||||
. ~/.bash_profile
|
. ~/.bash_profile
|
||||||
pyenv install 3.11.1 # tests, version supporting openssl 1.1
|
pyenv install 3.11.1 # tests, version supporting openssl 1.1
|
||||||
pyenv install 3.10.2 # tests, version supporting openssl 1.1
|
pyenv install 3.10.2 # tests, version supporting openssl 1.1
|
||||||
pyenv install 3.9.16 # tests, version supporting openssl 1.1, binary build
|
pyenv install 3.9.18 # tests, version supporting openssl 1.1, binary build
|
||||||
pyenv rehash
|
pyenv rehash
|
||||||
EOF
|
EOF
|
||||||
end
|
end
|
||||||
|
@ -179,8 +178,8 @@ def build_pyenv_venv(boxname)
|
||||||
. ~/.bash_profile
|
. ~/.bash_profile
|
||||||
cd /vagrant/borg
|
cd /vagrant/borg
|
||||||
# use the latest 3.9 release
|
# use the latest 3.9 release
|
||||||
pyenv global 3.9.16
|
pyenv global 3.9.18
|
||||||
pyenv virtualenv 3.9.16 borg-env
|
pyenv virtualenv 3.9.18 borg-env
|
||||||
ln -s ~/.pyenv/versions/borg-env .
|
ln -s ~/.pyenv/versions/borg-env .
|
||||||
EOF
|
EOF
|
||||||
end
|
end
|
||||||
|
@ -227,8 +226,8 @@ def run_tests(boxname, skip_env)
|
||||||
. ../borg-env/bin/activate
|
. ../borg-env/bin/activate
|
||||||
if which pyenv 2> /dev/null; then
|
if which pyenv 2> /dev/null; then
|
||||||
# for testing, use the earliest point releases of the supported python versions:
|
# for testing, use the earliest point releases of the supported python versions:
|
||||||
pyenv global 3.9.16 3.10.2 3.11.1
|
pyenv global 3.9.18 3.10.2 3.11.1
|
||||||
pyenv local 3.9.16 3.10.2 3.11.1
|
pyenv local 3.9.18 3.10.2 3.11.1
|
||||||
fi
|
fi
|
||||||
# otherwise: just use the system python
|
# otherwise: just use the system python
|
||||||
# avoid that git complains about dubious ownership if we use fakeroot:
|
# avoid that git complains about dubious ownership if we use fakeroot:
|
||||||
|
|
Loading…
Add table
Reference in a new issue