diff options
| author | Chris Wilson <qris@users.noreply.github.com> | 2018-03-12 22:06:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 22:06:29 +0000 |
| commit | 82445a8e54abbcb37e41db532130dcb82088ac5d (patch) | |
| tree | 28b9f1ac7afb1f062035ca4c6021325e4e0050c3 /infrastructure/travis-build.sh | |
| parent | 4a9c1e9f305ae4317cdd05d2641db2da86eef615 (diff) | |
| parent | f2223e6a6db1d8b282ab23a80fb34d7a89bb3a20 (diff) | |
Merge branch 'master' into fix_raidfile_i386
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`/.. |