Require ocaml 4.04.2

Summary: Tests rely on at least 4.04.1, and no harm in avoiding CVE-2017-9772.

Reviewed By: jeremydubreil

Differential Revision: D5334702

fbshipit-source-id: 2b9b7f1
master
Josh Berdine 8 years ago committed by Facebook Github Bot
parent 068622ce1b
commit 7a570cdebf

@ -11,7 +11,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install opam; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install opam; fi
install: install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 60 ./build-infer.sh --yes java --opam-switch 4.04.0 --only-setup-opam; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 60 ./build-infer.sh --yes java --opam-switch 4.04.2 --only-setup-opam; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then eval `opam config env`; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then eval `opam config env`; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam pin add -y --no-action -k git infer .; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam pin add -y --no-action -k git infer .; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam install -y infer; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then opam install -y infer; fi

@ -173,7 +173,7 @@ fi
AC_PROG_OCAML AC_PROG_OCAML
AC_ASSERT_PROG([ocamlc], [$OCAMLC]) AC_ASSERT_PROG([ocamlc], [$OCAMLC])
# check the version of OCaml # check the version of OCaml
AC_ASSERT_OCAML_MIN_VERSION([4.04.0]) AC_ASSERT_OCAML_MIN_VERSION([4.04.2])
AC_ASSERT_PROG([ocamlopt], [$OCAMLOPT]) AC_ASSERT_PROG([ocamlopt], [$OCAMLOPT])
AC_ASSERT_PROG([ocamlbuild], [$OCAMLBUILD]) AC_ASSERT_PROG([ocamlbuild], [$OCAMLBUILD])
AC_PROG_FINDLIB AC_PROG_FINDLIB

@ -40,7 +40,7 @@ RUN INFER_VERSION=v0.12.0; \
ln -s ${PWD}/infer-linux64-$INFER_VERSION /infer ln -s ${PWD}/infer-linux64-$INFER_VERSION /infer
# Compile Infer # Compile Infer
RUN OCAML_VERSION=4.04.0; \ RUN OCAML_VERSION=4.04.2; \
opam init --compiler=$OCAML_VERSION -j $(getconf _NPROCESSORS_ONLN || echo 1) --yes && \ opam init --compiler=$OCAML_VERSION -j $(getconf _NPROCESSORS_ONLN || echo 1) --yes && \
cd /infer && \ cd /infer && \
./build-infer.sh --opam-switch $OCAML_VERSION && \ ./build-infer.sh --opam-switch $OCAML_VERSION && \

@ -24,7 +24,7 @@ remove: [
"--prefix=%{prefix}%"] "--prefix=%{prefix}%"]
["make" "uninstall"] ["make" "uninstall"]
] ]
ocaml-version: [ >= "4.04.0" ] ocaml-version: [ >= "4.04.2" ]
depends: [ depends: [
"ANSITerminal" {>="0.7"} "ANSITerminal" {>="0.7"}
"atdgen" {>="1.6.0"} "atdgen" {>="1.6.0"}

Loading…
Cancel
Save