From 0a4b8129240d99637310ee9527899f166df3523d Mon Sep 17 00:00:00 2001
From: Guillaume Bury <guillaume.bury@gmail.com>
Date: Sat, 23 Jul 2016 13:58:45 +0200
Subject: [PATCH] Moved more commands in before_install for travis

---
 .travis-ci.sh | 7 -------
 .travis.yml   | 5 +++++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.travis-ci.sh b/.travis-ci.sh
index e5c6a74f..c5d58375 100644
--- a/.travis-ci.sh
+++ b/.travis-ci.sh
@@ -1,14 +1,7 @@
 # Edit this for your own project dependencies
 OPAM_DEPENDS="ocamlfind ocamlbuild"
 
-export OPAMYES=1
-export OPAMVERBOSE=1
-
-opam init
-opam switch ${OCAML_VERSION}
-eval `opam config env`
 opam install ${OPAM_DEPENDS}
-eval `opam config env`
 
 make lib
 make bin
diff --git a/.travis.yml b/.travis.yml
index 244a6f67..86c59b09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,11 @@ before_install:
   - echo "yes" | sudo add-apt-repository ppa:avsm/ocaml42+opam12
   - sudo apt-get update -qq
   - sudo apt-get install -qq ocaml ocaml-native-compilers camlp4-extra opam
+  - export OPAMYES=1
+  - export OPAMVERBOSE=1
+  - opam init
+  - opam switch ${OCAML_VERSION}
+  - eval `opam config env`
 env:
   - OCAML_VERSION=4.00.1
   - OCAML_VERSION=4.01.0