diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-05-14 09:56:08 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-05-14 09:56:08 -0500 |
| commit | 99e7af2569a80bab0e229d1853cd33af6b40a51f (patch) | |
| tree | d7c2bf5bd4bd59f241f8222753fa967cb4967c92 | |
| parent | af2be745e9668aa69b88648d0b49f8c4f275ce43 (diff) | |
| parent | a1b6a8f28b0545e8a0e310bfc732b7a09e3db97c (diff) | |
| download | pyopenssl-99e7af2569a80bab0e229d1853cd33af6b40a51f.tar.gz | |
Merge pull request #262 from hynek/add-osx-system-openssl
Add OS X's system OpenSSL to matrix
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index e49fbf0..717c32e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,10 @@ matrix: include: - language: generic os: osx - env: TOXENV=py27 + env: TOXENV=py27 OSX_OPENSSL=homebrew + - language: generic + os: osx + env: TOXENV=py27 OSX_OPENSSL=system - python: "2.6" # these are just to make travis's UI a bit prettier env: TOXENV=py26 - python: "2.7" @@ -58,7 +61,7 @@ matrix: allow_failures: - language: generic os: osx - env: TOXENV=py27 + env: TOXENV=py27 OSX_OPENSSL=homebrew - env: TOXENV=py26-cryptographyMaster - env: TOXENV=py27-cryptographyMaster - env: TOXENV=py33-cryptographyMaster @@ -82,7 +85,7 @@ install: script: - | - if [[ "$(uname -s)" == "Darwin" ]]; then + if [[ "$(uname -s)" == 'Darwin' && $OSX_OPENSSL == 'homebrew' ]]; then # set our flags to use homebrew openssl export ARCHFLAGS="-arch x86_64" export LDFLAGS="-L/usr/local/opt/openssl/lib" |