saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 10:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reflect changes after bumping Python to 3.8 in FreeBSD

Browse source
This commit is contained in:
krionbsd 2021-07-15 20:16:44 +02:00 • committed by Kirill Ponomarev
parent 095a7abf07
commit 3158d15d25
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/kitchen.vagrant.yml vendored
View file

@ -41,8 +41,8 @@ jobs:
fail-fast: false
matrix:
instance:
- py3-git-3000-freebsd-130
- py3-git-3000-freebsd-122
# - py3-git-3000-freebsd-130
# - py3-git-3000-freebsd-122
# - py3-git-3000-openbsd-6
- py3-git-3001-freebsd-130
- py3-git-3001-freebsd-122

10
bootstrap-salt.sh
View file

@ -5843,15 +5843,15 @@ install_freebsd_git_deps() {
if [ "${_POST_NEON_INSTALL}" -eq $BS_FALSE ]; then
SALT_DEPENDENCIES=$(/usr/local/sbin/pkg rquery %dn py37-salt)
SALT_DEPENDENCIES=$(/usr/local/sbin/pkg rquery %dn py38-salt)
# shellcheck disable=SC2086
/usr/local/sbin/pkg install -y ${SALT_DEPENDENCIES} python || return 1
/usr/local/sbin/pkg install -y py37-requests || return 1
/usr/local/sbin/pkg install -y py37-tornado4 || return 1
/usr/local/sbin/pkg install -y py38-requests || return 1
/usr/local/sbin/pkg install -y py38-tornado4 || return 1
else
/usr/local/sbin/pkg install -y python py37-pip py37-setuptools libzmq4 libunwind || return 1
/usr/local/sbin/pkg install -y python py38-pip py38-setuptools libzmq4 libunwind || return 1
fi
echodebug "Adapting paths to FreeBSD"
@ -5897,7 +5897,7 @@ install_freebsd_stable() {
# installing latest version of salt from FreeBSD CURRENT ports repo
#
# shellcheck disable=SC2086
/usr/local/sbin/pkg install -y py37-salt || return 1
/usr/local/sbin/pkg install -y py38-salt || return 1
return 0
}