TMP: add pins to make the CI happy

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
moby · Apr 24, 2017 · 8182f92 · 8182f92
1 parent f99fcdb
commit 8182f92
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,6 +3,9 @@ FROM ocaml/opam-dev@sha256:573b5d71e94104590a8282a9ae67b63a6144b15bafdacb9980391
 ENV OPAMERRLOGLEN=0 OPAMYES=1
 RUN sudo apk add tzdata aspcud gmp-dev perl
 
+RUN opam pin add hvsock --dev -n
+RUN opam pin add irmin.1.1.0 --dev -n
+RUN opam pin add irmin-unix.1.1.0 --dev -n
 RUN opam pin add -yn protocol-9p.0.8.0 'https://github.com/talex5/ocaml-9p.git#ping'
 RUN opam depext -ui lwt inotify alcotest conf-libev lambda-term asl win-eventlog camlzip irmin-watcher mtime mirage-flow conduit hvsock cohttp prometheus-app git.1.9.3 mirage-tc irmin.0.12.0 cmdliner.0.9.8 protocol-9p channel rresult win-error named-pipe
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -6,6 +6,7 @@ environment:
   FORK_BRANCH: master
   CYG_ROOT: C:\cygwin64
   PACKAGE: datakit
+  PINS: "hvsock,irmin.1.1.0:--dev"
 
 install:
   - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/$env:FORK_USER/ocaml-ci-scripts/$env:FORK_BRANCH/appveyor-install.ps1"))

diff --git a/circle.yml b/circle.yml
@@ -16,9 +16,12 @@ dependencies:
   - brew install wget ocaml opam dylibbundler
   - opam init --comp system -n https://github.com/ocaml/opam-repository.git
   - opam switch system
-  - opam update && opam upgrade
+  - opam pin add hvsock --dev -n
+  - opam pin add irmin.1.1.0 --dev -n
+  - opam pin add irmin-git.1.1.0 --dev -n
   - opam pin add datakit-server.dev . -n
   - opam pin add datakit.dev . -n
+  - opam update && upgrade
   - opam install depext && opam depext osx-fsevents datakit
   - opam list
   - opam reinstall datakit-server datakit -v

diff --git a/datakit.opam b/datakit.opam
@@ -22,7 +22,7 @@ depends: [
   "rresult" "astring" "fmt" "asetmap"
   "git"         {>= "1.9.3"}
   "uri"
-  "irmin"       {>= "1.0.0"}
+  "irmin"       {>= "1.1.0"}
   "irmin-git"   {>= "1.0.0"}
   "camlzip"     {>= "1.06"}
   "cstruct"     {>= "2.2"}