From ed79d550d2672424ba3f3650141057ae181aa269 Mon Sep 17 00:00:00 2001 From: Jules Villard Date: Mon, 17 Oct 2016 10:46:06 -0700 Subject: [PATCH] [travis] use new reason version Summary: We updated the version of Reason, which removes the need to pin reason/merlin/merlin_extend. In fact, the pinning we used to do breaks the compilation as the version of reason is too old. We don't need to pin anymore to get the right version of Reason, so simply remove the `opam pin ...` setup commands (as was done for ./build-infer.sh). Reviewed By: yunxing Differential Revision: D4030365 fbshipit-source-id: 19c9a39 --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3993e5c7a..f5c714fb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,6 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then eval `opam config env`; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam install -y depext; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam pin add -y merlin 'https://github.com/the-lambda-church/merlin.git#reason-0.0.1'; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam pin add -y merlin_extend 'https://github.com/let-def/merlin-extend.git#reason-0.0.1'; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam pin add -y --no-action reason 'https://github.com/facebook/reason.git#0.0.6'; fi install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam pin add -y --no-action infer .; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam depext infer; fi