diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2018-05-15 11:23:21 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-05-15 11:23:21 -0400 |
| commit | 7e8ce14b820cffb7fa03bdba0890b2df95e76a2e (patch) | |
| tree | d45e7312e096d59c1f8ea740a73c5bb293482834 /.travis/run.sh | |
| parent | 50bad375f5dd3fbb7c7ea62896e2538dc5734be6 (diff) | |
| download | cryptography-7e8ce14b820cffb7fa03bdba0890b2df95e76a2e.tar.gz cryptography-7e8ce14b820cffb7fa03bdba0890b2df95e76a2e.tar.bz2 cryptography-7e8ce14b820cffb7fa03bdba0890b2df95e76a2e.zip | |
Remove macOS travis stuff, we don't intend to reenable it (#4244)
Diffstat (limited to '.travis/run.sh')
| -rwxr-xr-x | .travis/run.sh | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/.travis/run.sh b/.travis/run.sh index 1e2ba71b..c190372d 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -3,36 +3,19 @@ set -e set -x -if [[ "$(uname -s)" == "Darwin" ]]; then - # initialize our pyenv +if [[ "${TOXENV}" == "pypy" ]]; then PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" +fi +if [ -n "${OPENSSL}" ]; then + OPENSSL_DIR="ossl-1/${OPENSSL}" - # set our flags to use homebrew openssl - # if the build is static we need different LDFLAGS - if [[ "${CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS}" == "1" ]]; then - export LDFLAGS="/usr/local/opt/openssl\@1.1/lib/libssl.a /usr/local/opt/openssl\@1.1/lib/libcrypto.a" - export CFLAGS="-I/usr/local/opt/openssl\@1.1/include" - else - # Compile the dynamic link build against 1.0.2 because the linker refuses to properly load 1.1.0 - export LDFLAGS="-L/usr/local/opt/openssl/lib" - export CFLAGS="-I/usr/local/opt/openssl/include" - fi -else - if [[ "${TOXENV}" == "pypy" ]]; then - PYENV_ROOT="$HOME/.pyenv" - PATH="$PYENV_ROOT/bin:$PATH" - eval "$(pyenv init -)" - fi - if [ -n "${OPENSSL}" ]; then - OPENSSL_DIR="ossl-1/${OPENSSL}" - - export PATH="$HOME/$OPENSSL_DIR/bin:$PATH" - export CFLAGS="-I$HOME/$OPENSSL_DIR/include" - # rpath on linux will cause it to use an absolute path so we don't need to do LD_LIBRARY_PATH - export LDFLAGS="-L$HOME/$OPENSSL_DIR/lib -Wl,-rpath=$HOME/$OPENSSL_DIR/lib" - fi + export PATH="$HOME/$OPENSSL_DIR/bin:$PATH" + export CFLAGS="-I$HOME/$OPENSSL_DIR/include" + # rpath on linux will cause it to use an absolute path so we don't need to do LD_LIBRARY_PATH + export LDFLAGS="-L$HOME/$OPENSSL_DIR/lib -Wl,-rpath=$HOME/$OPENSSL_DIR/lib" fi + source ~/.venv/bin/activate tox |