mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

travis: use openssl 1.1 for borg, use python 3.5.3 for 1.1 compat 

pyenv recently gained the ability to use (and actually prefer) openssl
1.1 on mac OS.

we need to use python 3.5.3, older is not compatible with openssl 1.1.
with python 3.5.2, python was built without ssl support.

also, we need to set the right PKG_CONFIG_PATH, so borg also uses 1.1.
This commit is contained in:
Thomas Waldmann 2019-04-07 01:32:08 +02:00
parent c1677ac246
commit f669d42443
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis/install.sh
View File

@ -14,7 +14,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
brew outdated pkg-config || brew upgrade pkg-config brew outdated pkg-config || brew upgrade pkg-config
# do NOT update openssl 1.0.x, brew will also update a lot of dependent pkgs (and their dependencies) then! # do NOT update openssl 1.0.x, brew will also update a lot of dependent pkgs (and their dependencies) then!
#brew outdated openssl || brew upgrade openssl #brew outdated openssl || brew upgrade openssl
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="/usr/local/opt/openssl@1.1/lib/pkgconfig:$PKG_CONFIG_PATH"
brew install readline brew install readline
export PKG_CONFIG_PATH="/usr/local/opt/readline/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="/usr/local/opt/readline/lib/pkgconfig:$PKG_CONFIG_PATH"
brew install zstd brew install zstd
@ -29,8 +29,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
case "${TOXENV}" in case "${TOXENV}" in
py35) py35)
pyenv install 3.5.2 pyenv install 3.5.3 # minimum for openssl 1.1.x
pyenv global 3.5.2 pyenv global 3.5.3
;; ;;
py36) py36)
pyenv install 3.6.0 pyenv install 3.6.0

2
.travis/run.sh
View File

@ -7,7 +7,7 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
eval "$(pyenv init -)" eval "$(pyenv init -)"
# set our flags to use homebrew openssl # set our flags to use homebrew openssl
export ARCHFLAGS="-arch x86_64" export ARCHFLAGS="-arch x86_64"
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="/usr/local/opt/openssl@1.1/lib/pkgconfig:$PKG_CONFIG_PATH"
fi fi
# do not use fakeroot, but run as root on travis. # do not use fakeroot, but run as root on travis.