From 4393f433252fb80d087cc8fab1879bad61e6868d Mon Sep 17 00:00:00 2001 From: Jules Villard Date: Mon, 26 Nov 2018 05:57:36 -0800 Subject: [PATCH] [travis] fix osx build Summary: Untested code didn't work, surprise! Reviewed By: mbouaziz Differential Revision: D13179256 fbshipit-source-id: 30a078242 --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2417df77c..8115504f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ os: - linux - osx services: docker -osx_image: xcode7.3 before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y aspcud; fi @@ -12,9 +11,8 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install opam; fi install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 60 ./build-infer.sh --yes java --user-opam-switch --only-setup-opam; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then eval `opam env`; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam install --yes infer .; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam init --reinit --no-setup --disable-sandboxing; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 60 opam install --yes .; fi script: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis/local_install_tests.sh; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis/docker_tests.sh; fi