Merge pull request #9 from djs55/fix-travis

Update travis to use opam 1.2
djs55 · Nov 21, 2014 · 57c8267 · 57c8267
2 parents cc4ceeb + 2655e38
commit 57c8267
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/.travis-ci.sh b/.travis-ci.sh
@@ -7,6 +7,8 @@ case "$OCAML_VERSION,$OPAM_VERSION" in
 4.00.1,1.1.0) ppa=avsm/ocaml40+opam11 ;;
 4.01.0,1.0.0) ppa=avsm/ocaml41+opam10 ;;
 4.01.0,1.1.0) ppa=avsm/ocaml41+opam11 ;;
+4.01.0,1.2.0) ppa=avsm/ocaml41+opam12 ;;
+4.02.0,1.2.0) ppa=avsm/ocaml42+opam12 ;;
 *) echo Unknown $OCAML_VERSION,$OPAM_VERSION; exit 1 ;;
 esac
 
@@ -23,7 +25,5 @@ opam --version
 opam --git-version
 
 opam init
-opam install ${OPAM_DEPENDS}
-
 eval `opam config env`
-make
+opam pin add xenstore .
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: c
 script: bash -ex .travis-ci.sh
 env:
-  - OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0
+  - OCAML_VERSION=4.01.0 OPAM_VERSION=1.2.0
+  - OCAML_VERSION=4.02.0 OPAM_VERSION=1.2.0
diff --git a/opam b/opam
@@ -0,0 +1,20 @@
+opam-version: "1"
+maintainer: "dave.scott@eu.citrix.com"
+build: [
+  [make "all"]
+  [make "install"]
+]
+remove: [["ocamlfind" "remove" "xenstore"]]
+depends: [
+  "cstruct" {>= "0.6.0"}
+  "lwt"
+  "uri"
+  "sexplib"
+  "stringext"
+  "ounit"
+  "ocamlfind"
+  "io-page"
+  "xen-evtchn"
+  "shared-memory-ring"
+  "cmdliner"
+]