diff --git a/Dockerfile b/Dockerfile index 6f03cf984..ae087026e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,10 @@ FROM ocaml/opam-dev@sha256:64dc0522876ebbd27b186e3ba955ae5ab864ace580add5b0d1abb ENV OPAMERRLOGLEN=0 OPAMYES=1 RUN sudo apk add tzdata aspcud gmp-dev perl -RUN opam pin add irmin.1.1.0 -n https://github.com/mirage/irmin.git#89196ad17c53b02f333022a87ecc264ec8c06af0 -RUN opam pin add irmin-git.1.1.0 -n https://github.com/mirage/irmin.git#89196ad17c53b02f333022a87ecc264ec8c06af0 +RUN opam pin add irmin.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede +RUN opam pin add irmin-mem.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede +RUN opam pin add irmin-git.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede + RUN opam pin add -yn protocol-9p.0.11.0 'https://github.com/mirage/ocaml-9p.git#v0.11.0' RUN opam pin add -yn protocol-9p-unix.0.11.0 'https://github.com/mirage/ocaml-9p.git#v0.11.0' diff --git a/Dockerfile.ci b/Dockerfile.ci index dcb0556cb..bd9374416 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -3,9 +3,12 @@ FROM ocaml/opam-dev@sha256:64dc0522876ebbd27b186e3ba955ae5ab864ace580add5b0d1abb ENV OPAMERRLOGLEN=0 OPAMYES=1 RUN sudo apk add tzdata aspcud -RUN opam pin add irmin.1.1.0 -n https://github.com/mirage/irmin.git#89196ad17c53b02f333022a87ecc264ec8c06af0 -RUN opam pin add irmin-git.1.1.0 -n https://github.com/mirage/irmin.git#89196ad17c53b02f333022a87ecc264ec8c06af0 -RUN opam pin add irmin-unix.1.1.0 -n https://github.com/mirage/irmin.git#89196ad17c53b02f333022a87ecc264ec8c06af0 +RUN opam pin add irmin.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede +RUN opam pin add irmin-mem.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede +RUN opam pin add irmin-fs.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede +RUN opam pin add irmin-http.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede +RUN opam pin add irmin-git.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede +RUN opam pin add irmin-unix.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede RUN opam pin add -yn protocol-9p.0.11.0 'https://github.com/mirage/ocaml-9p.git#v0.11.0' RUN opam pin add -yn protocol-9p-unix.0.11.0 'https://github.com/mirage/ocaml-9p.git#v0.11.0' diff --git a/Dockerfile.github b/Dockerfile.github index dc14e8d56..ec51b25f9 100644 --- a/Dockerfile.github +++ b/Dockerfile.github @@ -3,8 +3,10 @@ FROM ocaml/opam-dev@sha256:64dc0522876ebbd27b186e3ba955ae5ab864ace580add5b0d1abb ENV OPAMERRLOGLEN=0 OPAMYES=1 RUN sudo apk add tzdata aspcud -RUN opam pin add irmin.1.1.0 -n https://github.com/mirage/irmin.git#89196ad17c53b02f333022a87ecc264ec8c06af0 -RUN opam pin add irmin-git.1.1.0 -n https://github.com/mirage/irmin.git#89196ad17c53b02f333022a87ecc264ec8c06af0 +RUN opam pin add irmin.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede +RUN opam pin add irmin-mem.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede +RUN opam pin add irmin-git.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede + RUN opam pin add -yn protocol-9p.0.11.0 'https://github.com/mirage/ocaml-9p.git#v0.11.0' RUN opam pin add -yn protocol-9p-unix.0.11.0 'https://github.com/mirage/ocaml-9p.git#v0.11.0' diff --git a/appveyor.yml b/appveyor.yml index 83b6a7de5..7134f5d96 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ environment: FORK_BRANCH: master CYG_ROOT: C:\cygwin64 PACKAGE: datakit - PINS: "irmin.1.1.0:--dev irmin-git.1.1.0:--dev datakit-server.dev:. datakit-server-9p.dev:. datakit-github.dev:. datakit-client.dev:. datakit-client-9p.dev:." + PINS: "irmin.dev:--dev irmin-mem.dev:https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede irmin-git.dev:--dev datakit-server.dev:. datakit-server-9p.dev:. datakit-github.dev:. datakit-client.dev:. datakit-client-9p.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 index 16e9d50d7..fcf2e7879 100644 --- a/circle.yml +++ b/circle.yml @@ -18,8 +18,9 @@ dependencies: - opam init --comp system -n https://github.com/ocaml/opam-repository.git - opam switch system - 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 irmin.1.2.0 --dev -n + - opam pin add irmin-mem.1.2.0 -n https://github.com/mirage/irmin.git#ca886ac8e1a0b36879617d7c973852d6d04bfede + - opam pin add irmin-git.1.2.0 --dev -n - opam pin add datakit-server.dev . -n - opam pin add datakit-server-9p.dev . -n - opam pin add datakit.dev . -n diff --git a/datakit.opam b/datakit.opam index 8509b6e01..e9909728b 100644 --- a/datakit.opam +++ b/datakit.opam @@ -18,6 +18,7 @@ depends: [ "git" {>= "1.9.3"} "uri" "irmin" {>= "1.1.0"} + "irmin-mem" "irmin-git" {>= "1.0.0"} "camlzip" {>= "1.06"} "cstruct" {>= "2.2"} diff --git a/src/datakit/jbuild b/src/datakit/jbuild index 7a0fbe186..ab91b5b37 100644 --- a/src/datakit/jbuild +++ b/src/datakit/jbuild @@ -5,4 +5,4 @@ (public_name datakit) (wrapped false) (libraries (datakit_io bytes lwt astring logs result cstruct fmt rresult - irmin datakit-server asetmap prometheus-app)))) + irmin-mem datakit-server asetmap prometheus-app))))