Merge pull request #647 from avsm/uri-sexp

avsm · web-flow · commit 2fc17d86ce4b · 2019-07-12T15:52:18.000+01:00
support uri&gt;=3.0.0
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,7 @@
 
 - format source code using ocamlformat 0.9 and the `conventional`
   profile (@avsm).
+- support uri>=3.0.0 (@avsm)
 
 ### v0.12.4 (2019-04-13)
 
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,12 @@
 FROM ocaml/opam2:alpine
 RUN sudo apk add --no-cache tzdata aspcud gmp-dev perl libev-dev m4
 
+RUN opam switch 4.07
+
 ENV OPAMERRLOGLEN=0 OPAMYES=1
 
 RUN git -C /home/opam/opam-repository fetch origin && \
-    git -C /home/opam/opam-repository reset df84483e523f1eec710a2118e05920f9cdf882d3 --hard && \
+    git -C /home/opam/opam-repository reset 340acb7d88264bf29485b1d292388e1d91dc2214 --hard && \
     opam update -u
 
 RUN opam install alcotest lwt conf-libev inotify
diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -1,10 +1,12 @@
 FROM ocaml/opam2:alpine
 RUN sudo apk add --no-cache tzdata aspcud gmp-dev perl libev-dev m4
 
+RUN opam switch 4.07
+
 ENV OPAMERRLOGLEN=0 OPAMYES=1
 
 RUN git -C /home/opam/opam-repository fetch origin && \
-    git -C /home/opam/opam-repository reset df84483e523f1eec710a2118e05920f9cdf882d3 --hard && \
+    git -C /home/opam/opam-repository reset 340acb7d88264bf29485b1d292388e1d91dc2214 --hard && \
     opam update -u
 
 RUN opam install alcotest lwt conf-libev inotify
diff --git a/Dockerfile.client b/Dockerfile.client
@@ -1,10 +1,12 @@
 FROM ocaml/opam2:alpine
 RUN sudo apk add --no-cache tzdata aspcud gmp-dev perl libev-dev m4
 
+RUN opam switch 4.07
+
 ENV OPAMERRLOGLEN=0 OPAMYES=1
 
 RUN git -C /home/opam/opam-repository fetch origin && \
-    git -C /home/opam/opam-repository reset df84483e523f1eec710a2118e05920f9cdf882d3 --hard && \
+    git -C /home/opam/opam-repository reset 340acb7d88264bf29485b1d292388e1d91dc2214 --hard && \
     opam update -u
 
 RUN opam install alcotest lwt conf-libev inotify
diff --git a/Dockerfile.github b/Dockerfile.github
@@ -1,10 +1,12 @@
 FROM ocaml/opam2:alpine
 RUN sudo apk add --no-cache tzdata aspcud gmp-dev perl libev-dev m4
 
+RUN opam switch 4.07
+
 ENV OPAMERRLOGLEN=0 OPAMYES=1
 
 RUN git -C /home/opam/opam-repository fetch origin && \
-    git -C /home/opam/opam-repository reset df84483e523f1eec710a2118e05920f9cdf882d3 --hard && \
+    git -C /home/opam/opam-repository reset 340acb7d88264bf29485b1d292388e1d91dc2214 --hard && \
     opam update -u
 
 RUN opam install alcotest lwt conf-libev inotify tls
diff --git a/ci/src/dune b/ci/src/dune
@@ -5,7 +5,7 @@
  (libraries datakit-github datakit-client datakit-client-9p yojson cmdliner
    tyxml multipart-form-data prometheus-app.unix webmachine redis-lwt session
    pbkdf github protocol-9p-unix logs.cli session-redis-lwt cstruct-sexp
-   session-webmachine github-unix fmt.cli fmt.tty uri.sexp)
+   session-webmachine github-unix fmt.cli fmt.tty uri-sexp)
  (preprocess
   (per_module
    ((pps ppx_sexp_conv)
diff --git a/datakit-ci.opam b/datakit-ci.opam
@@ -41,6 +41,7 @@ depends: [
   "alcotest" {with-test}
   "cohttp-lwt-unix" {>= "1.0.0"}
   "base64" {>="3.1.0"}
+  "uri" {>="3.0.0"}
   "yojson" {>="1.7.0"}
 ]
 build: [

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ depends: [`
`41`	`41`	`"alcotest" {with-test}`
`42`	`42`	`"cohttp-lwt-unix" {>= "1.0.0"}`
`43`	`43`	`"base64" {>="3.1.0"}`
	`44`	`+ "uri" {>="3.0.0"}`
`44`	`45`	`"yojson" {>="1.7.0"}`
`45`	`46`	`]`
`46`	`47`	`build: [`