Update Travis config && OPAM dependencies

ocsigen · Feb 2, 2018 · 17ee54d · 17ee54d
1 parent 4d5ed45
commit 17ee54d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,12 @@ before_install:
 install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
 script: bash -ex .travis-opam.sh
 env:
-  - OCAML_VERSION=4.03 PINS="eliom:https://github.com/ocsigen/eliom.git ocsigen-toolkit:https://github.com/ocsigen/ocsigen-toolkit.git ocsigenserver:https://github.com/ocsigen/ocsigenserver.git" PACKAGE=ocsigen-start
-  - OCAML_VERSION=4.04 PINS="eliom:https://github.com/ocsigen/eliom.git ocsigen-toolkit:https://github.com/ocsigen/ocsigen-toolkit.git ocsigenserver:https://github.com/ocsigen/ocsigenserver.git" PACKAGE=ocsigen-start
+  - OCAML_VERSION=4.03 PINS="deriving:https://github.com/ocsigen/deriving.git eliom:https://github.com/ocsigen/eliom.git ocsigen-toolkit:https://github.com/ocsigen/ocsigen-toolkit.git" PACKAGE=ocsigen-start
+  - OCAML_VERSION=4.05 PINS="deriving:https://github.com/ocsigen/deriving.git eliom:https://github.com/ocsigen/eliom.git ocsigen-toolkit:https://github.com/ocsigen/ocsigen-toolkit.git" PACKAGE=ocsigen-start
+  - OCAML_VERSION=4.06 PINS="deriving:https://github.com/ocsigen/deriving.git eliom:https://github.com/ocsigen/eliom.git ocsigen-toolkit:https://github.com/ocsigen/ocsigen-toolkit.git" PACKAGE=ocsigen-start
 os:
   - linux
   - osx
+branches:
+  only:
+  - master
diff --git a/opam/opam b/opam/opam
@@ -13,8 +13,8 @@ depends: [
   "macaque" {>= "0.7.4"}
   "safepass"
   "ocsigen-i18n" {>= "3.1.0"}
-  "eliom" {>= "6.2"}
-  "ocsigen-toolkit" {>= "0.99"}
+  "eliom" {>= "6.3"}
+  "ocsigen-toolkit" {>= "1.1"}
   "js_of_ocaml-camlp4"
   "yojson"
 ]