From 5f34248cedb13b8b5600b97217bf93e9f30b1fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Tue, 31 Jan 2017 23:45:48 +0100 Subject: [PATCH] Re-enable OSX builds on Travis CI This reverts commit fc38f9b18a9dacc76b7e8a5c8633f0f02289daae. --- .travis.yml | 1 + ci/before_install.sh | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dd271f22e5..47af4eeb41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ addons: os: - linux + - osx rust: - stable diff --git a/ci/before_install.sh b/ci/before_install.sh index 06c75218dc..ebe4f4fb94 100644 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -1,6 +1,11 @@ set -e pushd ~ +# Workaround for Travis CI macOS bug (https://github.com/travis-ci/travis-ci/issues/6307) +if [ "${TRAVIS_OS_NAME}" == "osx" ]; then + rvm get head || true +fi + function llvm_version_triple() { if [ "$1" == "3.8" ]; then echo "3.8.0" @@ -18,9 +23,17 @@ function llvm_download() { tar -xf ${LLVM}.tar.xz -C llvm --strip-components=1 export LLVM_CONFIG_PATH=`pwd`/llvm/bin/llvm-config + if [ "${TRAVIS_OS_NAME}" == "osx" ]; then + cp llvm/lib/libclang.dylib /usr/local/lib/libclang.dylib + fi } -llvm_download linux-gnu-ubuntu-14.04 + +if [ "${TRAVIS_OS_NAME}" == "linux" ]; then + llvm_download linux-gnu-ubuntu-14.04 +else + llvm_download apple-darwin +fi popd set +e