diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-02-02 08:13:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 08:13:30 -0800 |
| commit | e277c7e817453f7bcf14512a69230d18f1c6f740 (patch) | |
| tree | 3d6d75a1a0f6e1222271f157ec306ffe61e965c7 | |
| parent | 44119ebc87b807a8147054d40afc7dcb9d638c2e (diff) | |
| parent | 86af08fb32ecbab92c50ebb0c7a701ada54aa0bf (diff) | |
Auto merge of #464 - emilio:osx-testing, r=fitzgen
Re-enable OSX builds on Travis CI
This reverts commit fc38f9b18a9dacc76b7e8a5c8633f0f02289daae.
r? @fitzgen
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | ci/before_install.sh | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index dd271f22..47af4eeb 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 06c75218..ebe4f4fb 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 |