Fix travis

magnars · Jun 24, 2017 · 4f46a0b · 4f46a0b
1 parent 942b1df
commit 4f46a0b
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,20 @@
 language: emacs-lisp
+sudo: required
 before_install:
   - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh
   - evm install $EVM_EMACS --use --skip
   - cask
+install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
 env:
-  - EVM_EMACS=emacs-24.3-travis
-  - EVM_EMACS=emacs-24.4-travis
-  - EVM_EMACS=emacs-24.5-travis
-  - EVM_EMACS=emacs-25.1-travis
-  - EVM_EMACS=emacs-git-snapshot-travis
+  - OCAML_VERSION=4.04 EVM_EMACS=emacs-24.3-travis
+  - OCAML_VERSION=4.04 EVM_EMACS=emacs-24.4-travis
+  - OCAML_VERSION=4.04 EVM_EMACS=emacs-24.5-travis
+  - OCAML_VERSION=4.04 EVM_EMACS=emacs-25.1-travis
+  - OCAML_VERSION=4.04 EVM_EMACS=emacs-git-snapshot-travis
 script:
-  ./run-travis-ci.sh
+  - bash -ex .travis-opam.sh
+  - opam install merlin
+  - ./run-travis-ci.sh
 
 matrix:
   allow_failures: