diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2018-10-08 21:24:33 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-10-09 09:24:33 +0800 |
| commit | 338b0b073d0bac8451e9d180edcfbba81888d010 (patch) | |
| tree | 9d5a80c61635cbee6c6261f5167c38d6ee98d3dd /.travis | |
| parent | 788b859efd679b5df90475b32eeccf593d7eb38e (diff) | |
| download | cryptography-338b0b073d0bac8451e9d180edcfbba81888d010.tar.gz cryptography-338b0b073d0bac8451e9d180edcfbba81888d010.tar.bz2 cryptography-338b0b073d0bac8451e9d180edcfbba81888d010.zip | |
Fixes #4459 -- switch all our builds to xenial on travis (#4486)
* Fixes #4459 -- switch all our builds to xenial on travis
* Attempt to fix tests
* Try disabling sudo?
* typo
* try this?
* shellcheck
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/install.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/.travis/install.sh b/.travis/install.sh index 0aecb2bd..20a88312 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -23,9 +23,14 @@ if [ -n "${OPENSSL}" ]; then shlib_sed make depend make -j"$(nproc)" - # avoid installing the docs - # https://github.com/openssl/openssl/issues/6685#issuecomment-403838728 - make install_sw install_ssldirs + if [[ "${OPENSSL}" =~ 1.0.1 ]]; then + # OpenSSL 1.0.1 doesn't support installing without the docs. + make install + else + # avoid installing the docs + # https://github.com/openssl/openssl/issues/6685#issuecomment-403838728 + make install_sw install_ssldirs + fi popd fi elif [ -n "${LIBRESSL}" ]; then |