diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2018-03-03 10:54:51 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2018-03-03 10:59:03 +0000 |
| commit | 6178fd3469fb18f1ec829f64698c21305141783c (patch) | |
| tree | 414af74fe5ee768795668f5fc5cf2af97b6fa59c /infrastructure/travis-build.sh | |
| parent | c2547266775954292d78ab90b1af925d57c3f9e3 (diff) | |
Use OSX builds to test OpenSSL 1.1 compatibility as well
See https://github.com/alex/pyopenssl/commit/02225c659a1441e5caeca0a327f85b241633f781
for example
Diffstat (limited to 'infrastructure/travis-build.sh')
| -rwxr-xr-x | infrastructure/travis-build.sh | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/infrastructure/travis-build.sh b/infrastructure/travis-build.sh index 74b58a3d..9ee3569e 100755 --- a/infrastructure/travis-build.sh +++ b/infrastructure/travis-build.sh @@ -4,11 +4,15 @@ set -e set -x if [ "$TRAVIS_OS_NAME" = "osx" ]; then - brew update + # No need to "brew update" first: https://docs.travis-ci.com/user/reference/osx/#Homebrew + # brew update + # Travis appears to have Boost and OpenSSL installed already: # brew install boost ccache openssl - ls /usr/local /usr/local/opt /usr/local/opt/openssl - brew install ccache + ls /usr/local /usr/local/opt /usr/local/opt/openssl /usr/local/opt/openssl@1.1 + + # Use OSX builds to test OpenSSL 1.1 compatibility as well: + brew install ccache openssl@1.1 fi ccache -s @@ -20,7 +24,9 @@ if [ "$BUILD" = 'cmake' ]; then fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then - EXTRA_ARGS="-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DBOOST_ROOT=/usr/local/opt/boost" + EXTRA_ARGS=" + -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 + -DBOOST_ROOT=/usr/local/opt/boost" fi cd `dirname $0` @@ -33,7 +39,10 @@ if [ "$BUILD" = 'cmake' ]; then [ "$TEST" = "n" ] || ctest -C $TEST_TARGET -V else if [ "$TRAVIS_OS_NAME" = "osx" ]; then - EXTRA_ARGS="--with-ssl-lib=/usr/local/opt/openssl/lib --with-ssl-headers=/usr/local/opt/openssl/include --with-boost=/usr/local/opt/boost" + EXTRA_ARGS=" + --with-ssl-lib=/usr/local/opt/openssl@1.1/lib + --with-ssl-headers=/usr/local/opt/openssl@1.1/include + --with-boost=/usr/local/opt/boost" fi cd `dirname $0`/.. |