Skip to content

Commit

Permalink
Disable OSX builds on Travis CI
Browse files Browse the repository at this point in the history
The wait time to get OSX machines on Travis CI is *way* too long at the
moment. We'll be able to revert this commit in the future, once Travis
CI adds more OSX machines to their cluster, hopefully.
  • Loading branch information
fitzgen committed Nov 11, 2016
1 parent 8d83bdf commit fc38f9b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ addons:

os:
- linux
- osx

rust:
- stable
Expand Down
15 changes: 1 addition & 14 deletions ci/before_install.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
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"
Expand All @@ -23,17 +18,9 @@ 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
}


if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
llvm_download linux-gnu-ubuntu-14.04
else
llvm_download apple-darwin
fi
llvm_download linux-gnu-ubuntu-14.04

popd
set +e

0 comments on commit fc38f9b

Please sign in to comment.