From 75b9d1fdc5951e8943940596f7e1825ad0a82508 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Wed, 28 Nov 2018 17:39:08 +0000 Subject: [PATCH 1/4] fix travis --- tools/travis.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/travis.sh b/tools/travis.sh index f878e4aa7b..34c71cd30a 100644 --- a/tools/travis.sh +++ b/tools/travis.sh @@ -5,12 +5,12 @@ set -x # Install system packages. packages_apt () { case $COMPILER in - 4.02) PPA=avsm/ocaml42+opam12;; - 4.03) PPA=avsm/ocaml42+opam12; DO_SWITCH=yes;; - 4.04) PPA=avsm/ocaml42+opam12; DO_SWITCH=yes;; - 4.05) PPA=avsm/ocaml42+opam12; DO_SWITCH=yes;; - 4.06) PPA=avsm/ocaml42+opam12; DO_SWITCH=yes;; - 4.07) PPA=avsm/ocaml42+opam12; DO_SWITCH=yes;; + 4.02) PPA=avsm/ppa;; + 4.03) PPA=avsm/ppa; DO_SWITCH=yes;; + 4.04) PPA=avsm/ppa; DO_SWITCH=yes;; + 4.05) PPA=avsm/ppa; DO_SWITCH=yes;; + 4.06) PPA=avsm/ppa; DO_SWITCH=yes;; + 4.07) PPA=avsm/ppa; DO_SWITCH=yes;; *) echo Unsupported compiler $COMPILER; exit 1;; esac From e0bfb989367e4108692b1826d6c8aef4c0f28319 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Wed, 28 Nov 2018 18:01:38 +0000 Subject: [PATCH 2/4] fix again --- tools/travis.sh | 91 ++----------------------------------------------- 1 file changed, 3 insertions(+), 88 deletions(-) diff --git a/tools/travis.sh b/tools/travis.sh index 34c71cd30a..f8475d2305 100644 --- a/tools/travis.sh +++ b/tools/travis.sh @@ -1,94 +1,10 @@ set -x - - # Install system packages. -packages_apt () { - case $COMPILER in - 4.02) PPA=avsm/ppa;; - 4.03) PPA=avsm/ppa; DO_SWITCH=yes;; - 4.04) PPA=avsm/ppa; DO_SWITCH=yes;; - 4.05) PPA=avsm/ppa; DO_SWITCH=yes;; - 4.06) PPA=avsm/ppa; DO_SWITCH=yes;; - 4.07) PPA=avsm/ppa; DO_SWITCH=yes;; - *) echo Unsupported compiler $COMPILER; exit 1;; - esac - - sudo add-apt-repository -y ppa:$PPA - sudo apt-get update -qq - - if [ -z "$DO_SWITCH" ] - then - sudo apt-get install -qq ocaml-nox - fi - - sudo apt-get install -qq opam - -} - -packages_homebrew () { - brew update > /dev/null - - if [ "$COMPILER" = system ] - then - brew install ocaml - # The system compiler on Homebrew is now 4.06 or higher, and there is no - # system Camlp4 package compatible with that (at least not yet). See: - # https://github.com/ocaml/opam-repository/pull/10455 - HAVE_CAMLP4=no - else - DO_SWITCH=yes - fi - - brew install opam - -} - -packages_osx () { - case $PACKAGE_MANAGER in - *) packages_homebrew;; - esac -} - -packages () { - case $TRAVIS_OS_NAME in - linux) packages_apt;; - osx) packages_osx;; - *) echo Unsupported system $TRAVIS_OS_NAME; exit 1;; - esac -} +wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-ocaml.sh +bash -ex .travis-ocaml.sh -packages - - - -# Initialize OPAM and switch to the right compiler, if necessary. -case $COMPILER in - 4.02) OCAML_VERSION=4.02.3;; - 4.03) OCAML_VERSION=4.03.0;; - 4.04) OCAML_VERSION=4.04.2;; - 4.05) OCAML_VERSION=4.05.0;; - 4.06) OCAML_VERSION=4.06.0;; - 4.07) OCAML_VERSION=4.07.0;; - system) OCAML_VERSION=`ocamlc -version`;; - *) echo Unsupported compiler $COMPILER; exit 1;; -esac - -if [ "$FLAMBDA" = yes ] -then - SWITCH="$OCAML_VERSION+flambda" -else - SWITCH="$OCAML_VERSION" -fi - -if [ -n "$DO_SWITCH" ] -then - opam init --compiler=$SWITCH -y -a -else - opam init -y -a -fi - -eval `opam config env` +eval $(opam env) ACTUAL_COMPILER=`ocamlc -version` if [ "$ACTUAL_COMPILER" != "$OCAML_VERSION" ] @@ -97,7 +13,6 @@ then fi - # Pin Js_of_ocaml, install dependencies, and then install Js_of_ocaml. # Js_of_ocaml is installed # separately because we want to keep the build directory for running the tests. From ce9805dac46bedc2aa77cbe6c81d2ff390741364 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Wed, 28 Nov 2018 18:05:29 +0000 Subject: [PATCH 3/4] fix travis --- .travis.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index b04118f37a..38e778140b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,23 @@ -sudo: required - language: c matrix: include: - os: linux - env: COMPILER=4.04 + env: COMPILER_VERSION=4.04 - os: linux - env: COMPILER=4.05 + env: COMPILER_VERSION=4.05 - os: linux - env: COMPILER=4.06 + env: COMPILER_VERSION=4.06 - os: linux - env: COMPILER=4.07 + env: COMPILER_VERSION=4.07 allow_failures: - os: linux - env: COMPILER=4.02 + env: COMPILER_VERSION=4.02 - os: linux - env: COMPILER=4.03 + env: COMPILER_VERSION=4.03 - os: osx - env: COMPILER=system + env: COMPILER_VERSION=system fast_finish: true From 69e47f4a009e52b17096bacf871aa88ac53c9c33 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Wed, 28 Nov 2018 18:07:51 +0000 Subject: [PATCH 4/4] fix travis --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38e778140b..76ae12163b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,21 +3,21 @@ language: c matrix: include: - os: linux - env: COMPILER_VERSION=4.04 + env: OCAML_VERSION=4.04 - os: linux - env: COMPILER_VERSION=4.05 + env: OCAML_VERSION=4.05 - os: linux - env: COMPILER_VERSION=4.06 + env: OCAML_VERSION=4.06 - os: linux - env: COMPILER_VERSION=4.07 + env: OCAML_VERSION=4.07 allow_failures: - os: linux - env: COMPILER_VERSION=4.02 + env: OCAML_VERSION=4.02 - os: linux - env: COMPILER_VERSION=4.03 + env: OCAML_VERSION=4.03 - os: osx - env: COMPILER_VERSION=system + env: OCAML_VERSION=system fast_finish: true