summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-11-11 14:21:23 -0600
committerGitHub <noreply@github.com>2016-11-11 14:21:23 -0600
commit08f56c3fc4b204313918f9dbbce935ace4365f43 (patch)
tree513515e01be083b1bba13a709cb8c31f53e966a9
parentc2e7f46a326eb7e7ec99dbe9f68d8f4020223541 (diff)
parentfc38f9b18a9dacc76b7e8a5c8633f0f02289daae (diff)
Auto merge of #238 - fitzgen:disable-osx-travis, r=emilio
Disable OSX builds on Travis CI 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. r? @emilio
-rw-r--r--.travis.yml1
-rw-r--r--ci/before_install.sh15
2 files changed, 1 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml
index 36bafd7a..467c42dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ addons:
os:
- linux
- - osx
rust:
- stable
diff --git a/ci/before_install.sh b/ci/before_install.sh
index ebe4f4fb..06c75218 100644
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -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"
@@ -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