diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-12 21:14:57 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-01-12 21:14:57 -0800 |
| commit | f290f7d92d7608c6286b92ed235fdf4259627a5a (patch) | |
| tree | db43c379791b83688400ca3f98debc3479881640 /.travis | |
| parent | a2fdd5270b274c934fff64d66b110943d97460ca (diff) | |
| parent | 26287be0dccc51730608475fdde8f0b3f474e20e (diff) | |
| download | cryptography-f290f7d92d7608c6286b92ed235fdf4259627a5a.tar.gz cryptography-f290f7d92d7608c6286b92ed235fdf4259627a5a.tar.bz2 cryptography-f290f7d92d7608c6286b92ed235fdf4259627a5a.zip | |
Merge pull request #448 from reaperhulk/travis-add-brew-osx
Add Homebrew OpenSSL to Travis OS X Matrix
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/install.sh | 15 | ||||
| -rwxr-xr-x | .travis/run.sh | 16 |
2 files changed, 27 insertions, 4 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index e6ea2537..1e3b1702 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -3,10 +3,17 @@ set -e set -x -if [[ "${OPENSSL}" == "0.9.8" && "$(uname -s)" != "Darwin" ]]; then - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main" - sudo apt-get -y update - sudo apt-get install -y --force-yes libssl-dev/lucid +if [[ "${OPENSSL}" == "0.9.8" ]]; then + if [[ "$(uname -s)" != "Darwin" ]]; then + sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ lucid main" + sudo apt-get -y update + sudo apt-get install -y --force-yes libssl-dev/lucid + else + # travis has openssl installed via brew already, but let's be sure + if [[ "$(brew list | grep openssl)" != "openssl" ]]; then + brew install openssl + fi + fi fi if [[ "${TOX_ENV}" == "docs" && "$(name -s)" != "Darwin" ]]; then diff --git a/.travis/run.sh b/.travis/run.sh new file mode 100755 index 00000000..4c01d67a --- /dev/null +++ b/.travis/run.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e +set -x + +if [[ "$(uname -s)" == "Darwin" ]]; then + eval "$(pyenv init -)" + if [[ "${OPENSSL}" != "0.9.8" ]]; then + # so set our flags to use homebrew openssl + export ARCHFLAGS="-arch x86_64" + export LDFLAGS="-L/usr/local/opt/openssl/lib" + export CFLAGS="-I/usr/local/opt/openssl/include" + fi +fi +source ~/.venv/bin/activate +tox -e $TOX_ENV |