Skip to content

Commit fc38f9b

Browse files
committed
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.
1 parent 8d83bdf commit fc38f9b

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ addons:
99

1010
os:
1111
- linux
12-
- osx
1312

1413
rust:
1514
- stable

ci/before_install.sh

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
set -e
22
pushd ~
33

4-
# Workaround for Travis CI macOS bug (https://github.com/travis-ci/travis-ci/issues/6307)
5-
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
6-
rvm get head || true
7-
fi
8-
94
function llvm_version_triple() {
105
if [ "$1" == "3.8" ]; then
116
echo "3.8.0"
@@ -23,17 +18,9 @@ function llvm_download() {
2318
tar -xf ${LLVM}.tar.xz -C llvm --strip-components=1
2419

2520
export LLVM_CONFIG_PATH=`pwd`/llvm/bin/llvm-config
26-
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
27-
cp llvm/lib/libclang.dylib /usr/local/lib/libclang.dylib
28-
fi
2921
}
3022

31-
32-
if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
33-
llvm_download linux-gnu-ubuntu-14.04
34-
else
35-
llvm_download apple-darwin
36-
fi
23+
llvm_download linux-gnu-ubuntu-14.04
3724

3825
popd
3926
set +e

0 commit comments

Comments
 (0)