borgbackup/borg
1
1
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-10-26 12:41:29 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4499 from ThomasWaldmann/macosx-pyenv-openssl11

Browse Source 
travis: use openssl 1.1 for borg, use python 3.5.3 for 1.1 compat
This commit is contained in:
TW 2019-04-07 15:41:06 +02:00 committed by GitHub
commit e83417ed05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
# 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
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
export PKG_CONFIG_PATH="/usr/local/opt/readline/lib/pkgconfig:$PKG_CONFIG_PATH"
brew install zstd
@ -29,8 +29,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
case "${TOXENV}" in
py35)
pyenv install 3.5.2
pyenv global 3.5.2
pyenv install 3.5.3 # minimum for openssl 1.1.x
pyenv global 3.5.3
;;
py36)
pyenv install 3.6.0

2
.travis/run.sh
View File

@ -7,7 +7,7 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
eval "$(pyenv init -)"
# set our flags to use homebrew openssl
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
# do not use fakeroot, but run as root on travis.