diff options
| author | Hynek Schlawack <hs@ox.cx> | 2015-05-14 14:24:04 +0200 |
|---|---|---|
| committer | Hynek Schlawack <hs@ox.cx> | 2015-05-14 14:24:04 +0200 |
| commit | ee64cc410cd160d937d12635c462dc3b23b6049f (patch) | |
| tree | 29c47ced43f8f5a6c646cd94c402ca340d7a7f66 | |
| parent | af2be745e9668aa69b88648d0b49f8c4f275ce43 (diff) | |
| download | pyopenssl-ee64cc410cd160d937d12635c462dc3b23b6049f.tar.gz | |
Add OS X's system OpenSSL to matrix
| -rw-r--r-- | .travis.yml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index e49fbf0..ddab547 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,14 @@ 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 +65,9 @@ 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 +91,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" |