zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Travis: revert the hack for transient build failures.

pull/168/head
whitequark 2017-01-16 12:29:29 +00:00
parent 67146f6ab2
commit 04e86d9b36
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -4,6 +4,7 @@ os:
- osx - osx
sudo: required sudo: required
dist: trusty dist: trusty
osx_image: xcode8.2
install: install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis/install-debian.sh; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis/install-debian.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis/install-macos.sh; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis/install-macos.sh; fi

14
.travis/build-macos.sh
View File

@ -5,16 +5,4 @@ if echo $TRAVIS_TAG | grep ^v; then BUILD_TYPE=RelWithDebInfo; else BUILD_TYPE=D
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
if ! make VERBOSE=1; then make VERBOSE=1
echo "Sigh, transient build failure. Retrying..."
if ! make VERBOSE=1; then
echo "Another transient build failure. Retrying..."
if ! make VERBOSE=1; then
echo "I can't believe how deep the Travis brokenness goes. Retrying..."
if ! make VERBOSE=1; then
echo "Okay, this is probably an actual bug."
exit 1
fi
fi
fi
fi