Merge pull request #2278 from art-w/release-3.9.0

mirage · Oct 17, 2023 · eb5fc91 · eb5fc91
2 parents fddb6f0 + 4fe00f3
commit eb5fc91
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,4 @@
-## Unreleased
+## 3.9.0 (2023-10-05)
 
 ### Added
 

diff --git a/irmin-cli.opam b/irmin-cli.opam
@@ -36,7 +36,7 @@ depends: [
   "cohttp-lwt-unix"
   "conduit"
   "conduit-lwt"
-  "conduit-lwt-unix"
+  "conduit-lwt-unix" {>= "6.0.0"}
   "websocket-lwt-unix"
   "ppx_blob"      {>= "0.7.2"}
   "logs"

diff --git a/irmin-client.opam b/irmin-client.opam
@@ -5,24 +5,26 @@ authors: "Zach Shipko <[email protected]>"
 license: "ISC"
 homepage: "https://github.com/mirage/irmin"
 doc: "https://irmin.org"
+dev-repo: "git+ssh://github.com/mirage/irmin"
 bug-reports: "https://github.com/mirage/irmin/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
-  "dune" {>= "2.0.0"}
+  "dune" {>= "2.9.0"}
   "irmin-server" {= version}
+  "irmin-cli" {= version}
   "ipaddr"
   "websocket-lwt-unix"
-  "conduit-lwt-unix"
+  "conduit-lwt-unix" {>= "6.0.0"}
   "lwt-dllist"
   "js_of_ocaml-lwt"
   "brr" {>= "0.0.4"}
   "fmt" {>= "0.9.0"}
   "logs" {>= "0.7.0"}
   "lwt" {>= "5.7.0"}
+  "irmin-test" {= version & with-test}
 ]
 build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name] {with-test}
 ]
-dev-repo: "git+ssh://github.com/mirage/irmin"
diff --git a/irmin-server.opam b/irmin-server.opam
@@ -5,25 +5,28 @@ authors: "Zach Shipko <[email protected]>"
 license: "ISC"
 homepage: "https://github.com/mirage/irmin"
 doc: "https://irmin.org"
+dev-repo: "git+ssh://github.com/mirage/irmin"
 bug-reports: "https://github.com/mirage/irmin/issues"
 depends: [
   "ocaml" {>= "4.08.0"}
-  "dune" {>= "2.0.0"}
+  "dune" {>= "2.9.0"}
   "optint" {>= "0.1.0"}
   "irmin" {= version}
   "ppx_irmin" {= version}
+  "irmin-pack" {= version}
   "uri"
   "fmt"
   "cmdliner" {>= "1.0.4"}
   "logs" {>= "0.7.0"}
   "lwt" {>= "5.4.0"}
-  "conduit-lwt-unix"
+  "conduit-lwt-unix" {>= "6.0.0"}
   "websocket-lwt-unix"
   "cohttp-lwt-unix"
   "ppx_blob" {>= "0.7.2"}
   "digestif" {>= "1.1.4"}
   "alcotest-lwt" {>= "1.7.0" & with-test}
   "irmin-watcher" {>= "0.5.0" & with-test}
+  "irmin-test" {= version & with-test}
 ]
 
 build: [

diff --git a/test/irmin-server/dune → test/irmin-client/dune b/test/irmin-server/dune → test/irmin-client/dune
@@ -1,6 +1,6 @@
 (test
  (name test)
- (package irmin-server)
+ (package irmin-client)
  (libraries
   irmin.mem
   irmin-server.unix

diff --git a/test/irmin-server/test.ml → test/irmin-client/test.ml b/test/irmin-server/test.ml → test/irmin-client/test.ml
diff --git a/test/irmin-server/util.ml → test/irmin-client/util.ml b/test/irmin-server/util.ml → test/irmin-client/util.ml