Updates (lwd, ocaml-ci), reformat, support cmdliner+logs+fmt

.gitmodules

@@ -1,6 +1,4 @@
-[submodule "ocaml-ci"]
-	path = ocaml-ci
-	url = https://github.com/ocaml-ci/ocaml-ci.git
 [submodule "lwd"]
 	path = lwd
 	url = https://github.com/let-def/lwd.git
+	branch = master

.ocamlformat

@@ -1,3 +1,3 @@
-version = 0.15.0
+version = 0.24.1
 profile = conventional
 break-infix = fit-or-vertical

citty.opam

@@ -1,16 +1,44 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
+synopsis: "CI in TTY"
+maintainer: ["Frédéric Bour"]
+authors: ["Frédéric Bour"]
 license: "MIT"
+homepage: "https://github.com/ocurrent/citty"
+bug-reports: "https://github.com/ocurrent/citty/issues"
+depends: [
+  "dune" {>= "3.6"}
+  "current_rpc"
+  "capnp"
+  "capnp-rpc-unix"
+  "lwt" {>= "5.6.1"}
+  "notty" {>= "0.2.3"}
+  "lwd" {>= "0.3"}
+  "nottui" {>= "0.3"}
+  "nottui-lwt" {>= "0.3"}
+  "ocaml-ci-api"
+  "fpath"
+  "fmt"
+  "logs"
+  "cmdliner" {>= "1.1.0"}
+  "odoc" {with-doc}
+]
 build: [
-  ["dune" "subst"] {pinned}
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-  ["dune" "build" "-p" name "@doc"] {with-doc}
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/ocurrent/citty.git"
+pin-depends: [
+  [ "ocaml-ci-api.dev" "git+https://github.com/ocurrent/ocaml-ci.git#9b9a3d77eb2fd51017e5934b533a6d8fb190323b" ] # master
+  [ "solver-service-api.dev" "git+https://github.com/ocurrent/solver-service.git#2e0695f844c45048a6e40e2d45a2aaff46c9c163" ] # solver-ci
 ]
-authors: ["Frédéric Bour"]
-maintainer: "Frédéric Bour"
-bug-reports: "https://github.com/ocaml-ci/citty/issues"
-homepage: "https://github.com/ocaml-ci/citty"
-dev-repo: "git+https://github.com/ocaml-ci/citty.git"
-synopsis: "CI in TTY"
-depends: ["current_rpc" "capnp" "capnp-rpc-unix" "lwt" "notty" "fpath" "fmt"]

citty.opam.template

@@ -0,0 +1,4 @@
+pin-depends: [
+  [ "ocaml-ci-api.dev" "git+https://github.com/ocurrent/ocaml-ci.git#9b9a3d77eb2fd51017e5934b533a6d8fb190323b" ] # master
+  [ "solver-service-api.dev" "git+https://github.com/ocurrent/solver-service.git#2e0695f844c45048a6e40e2d45a2aaff46c9c163" ] # solver-ci
+]

dune

@@ -1 +1 @@
-(vendored_dirs lwd ocaml-ci)
+(vendored_dirs lwd)

dune-project

@@ -1,13 +1,27 @@
-(lang dune 2.0)
-
+(lang dune 3.6)
 (name citty)
 
 (generate_opam_files true)
-(source (github ocaml-ci/citty))
+
+(source (github ocurrent/citty))
 (authors "Frédéric Bour")
+(maintainers "Frédéric Bour")
 (license "MIT")
 
 (package
  (name citty)
  (synopsis "CI in TTY")
- (depends current_rpc capnp capnp-rpc-unix lwt notty fpath fmt))
+ (depends
+  current_rpc
+  capnp
+  capnp-rpc-unix
+  (lwt (>= 5.6.1))
+  (notty (>= 0.2.3))
+  (lwd (>= 0.3))
+  (nottui (>= 0.3))
+  (nottui-lwt (>= 0.3))
+  ocaml-ci-api
+  fpath
+  fmt
+  logs
+  (cmdliner (>= 1.1.0))))

src/dune

@@ -1,5 +1,17 @@
 (executable
  (name main)
+ (public_name citty)
  (modes byte exe)
- (libraries ocaml-ci-api current_rpc capnp-rpc-unix lwd nottui nottui-lwt
-   nottui-widgets))
+ (libraries
+  ocaml-ci-api
+  current_rpc
+  capnp-rpc-unix
+  lwd
+  nottui
+  nottui-lwt
+  fmt
+  fmt.cli
+  fmt.tty
+  logs
+  logs.fmt
+  logs.cli))