From 8c65263bfd829bd455f5ad61eb1f83f3658ed6b7 Mon Sep 17 00:00:00 2001 From: Bertrand Bonnefoy-Claudet Date: Mon, 15 Dec 2025 12:45:52 +0100 Subject: [PATCH] Update dependencies and fix CI --- README.md | 1 + cs_api_cli/cs_api_cli.ml | 15 ++++----- cs_api_client.opam | 3 +- cs_api_client.opam.locked | 59 +++++++++++++++++------------------ cs_api_client.opam.win.locked | 56 ++++++++++++++++----------------- 5 files changed, 67 insertions(+), 67 deletions(-) diff --git a/README.md b/README.md index 3220e86..6f5e000 100644 --- a/README.md +++ b/README.md @@ -125,6 +125,7 @@ ca_path = "/path/to/self-signed-cert.pem" profile_id = 1 project_id = 3 slot_name = "cs-api-test" +is_default_url = false ``` ## Updating dependencies diff --git a/cs_api_cli/cs_api_cli.ml b/cs_api_cli/cs_api_cli.ml index 81205f2..01d0d56 100644 --- a/cs_api_cli/cs_api_cli.ml +++ b/cs_api_cli/cs_api_cli.ml @@ -376,20 +376,21 @@ module Common = struct in let color = Cmdliner.Arg.info ["color"] ~docs ~doc in let parser = function - | "auto" -> `Ok Color.Auto - | "always" -> `Ok Color.Always - | "never" -> `Ok Color.Never + | "auto" -> Ok Color.Auto + | "always" -> Ok Color.Always + | "never" -> Ok Color.Never | _ as s -> - `Error - (Printf.sprintf - "Invalid color: %s. Expected: 'auto', 'always' or 'never'." s) + Error + (`Msg + (Printf.sprintf + "Invalid color: %s. Expected: 'auto', 'always' or 'never'." s)) in let printer fmt = function | Color.Auto -> Fmt.string fmt "auto" | Color.Always -> Fmt.string fmt "always" | Color.Never -> Fmt.string fmt "never" in - Cmdliner.Arg.(value & opt (parser, printer) Color.Auto color) + Cmdliner.Arg.(value & opt (conv (parser, printer)) Color.Auto color) in let verbosity = let doc = diff --git a/cs_api_client.opam b/cs_api_client.opam index 0c2bd5b..4b8ef2e 100644 --- a/cs_api_client.opam +++ b/cs_api_client.opam @@ -17,8 +17,9 @@ depends: [ "cmdliner" {>= "1.2.0"} "containers" {>= "3.6"} "dune" {>= "2.7.0"} + "fmt" {>= "0.11.0"} "logs" {>= "0.7.0"} - "lwt" + "lwt" {< "5.9.0"} # For compilation on CentOS 7 "lwt_ppx" "ocaml" {>= "4.14.0"} "ocamlformat" {= "0.25.1" & with-dev-setup} diff --git a/cs_api_client.opam.locked b/cs_api_client.opam.locked index 06056cb..015b3f3 100644 --- a/cs_api_client.opam.locked +++ b/cs_api_client.opam.locked @@ -8,65 +8,62 @@ license: "BSD-2-Clause" homepage: "https://github.com/cryptosense/api-client" bug-reports: "https://github.com/cryptosense/api-client/issues" depends: [ - "alcotest" {= "1.7.0" & with-test} + "alcotest" {= "1.9.1" & with-test} "astring" {= "0.8.5" & with-test} - "base" {= "v0.16.3" & with-dev-setup} + "base" {= "v0.16.4" & with-dev-setup} "base-bigarray" {= "base"} "base-bytes" {= "base"} "base-threads" {= "base"} "base-unix" {= "base"} - "base64" {= "3.5.1"} + "base64" {= "3.5.2"} "camlp-streams" {= "5.0.1" & with-dev-setup} "cmdliner" {= "1.3.0"} - "conf-bash" {= "1" & with-dev-setup} "conf-libcurl" {= "2"} - "containers" {= "3.13.1"} - "cppo" {= "1.6.9"} + "containers" {= "3.16"} + "cppo" {= "1.8.0"} "csexp" {= "1.5.2"} - "dune" {= "3.16.0"} - "dune-build-info" {= "3.16.0" & with-dev-setup} - "dune-configurator" {= "3.16.0"} + "dune" {= "3.20.2"} + "dune-build-info" {= "3.20.2" & with-dev-setup} + "dune-configurator" {= "3.20.2"} "either" {= "1.0.0"} - "fix" {= "20230505" & with-dev-setup} - "fmt" {= "0.9.0"} + "fix" {= "20250919" & with-dev-setup} + "fmt" {= "0.11.0"} "fpath" {= "0.7.3" & with-dev-setup} - "host-arch-x86_64" {= "1"} - "host-system-other" {= "1"} - "logs" {= "0.7.0"} - "lwt" {= "5.7.0"} - "lwt_ppx" {= "2.1.0"} - "menhir" {= "20240715" & with-dev-setup} - "menhirCST" {= "20240715" & with-dev-setup} - "menhirLib" {= "20240715" & with-dev-setup} - "menhirSdk" {= "20240715" & with-dev-setup} + "logs" {= "0.10.0"} + "lwt" {= "5.8.1"} + "lwt_ppx" {= "5.9.2"} + "menhir" {= "20250912" & with-dev-setup} + "menhirCST" {= "20250912" & with-dev-setup} + "menhirLib" {= "20250912" & with-dev-setup} + "menhirSdk" {= "20250912" & with-dev-setup} "ocaml" {= "4.14.2"} "ocaml-base-compiler" {= "4.14.2"} "ocaml-compiler-libs" {= "v0.12.4"} "ocaml-config" {= "2"} "ocaml-options-vanilla" {= "1"} "ocaml-syntax-shims" {= "1.0.0" & with-test} - "ocaml-version" {= "3.6.7" & with-dev-setup} - "ocamlbuild" {= "0.15.0"} - "ocamlfind" {= "1.9.6"} + "ocaml-version" {= "4.0.3" & with-dev-setup} + "ocamlbuild" {= "0.16.1"} + "ocamlfind" {= "1.9.8"} "ocamlformat" {= "0.25.1" & with-dev-setup} "ocamlformat-lib" {= "0.25.1" & with-dev-setup} - "ocp-indent" {= "1.8.1" & with-dev-setup} + "ocp-indent" {= "1.9.0" & with-dev-setup} "ocplib-endian" {= "1.2"} "ocurl" {= "0.9.1"} "ppx_derivers" {= "1.2.1"} - "ppx_deriving" {= "6.0.2"} - "ppxlib" {= "0.33.0"} - "re" {= "1.11.0" & with-test} + "ppx_deriving" {= "6.1.1"} + "ppxlib" {= "0.37.0"} + "re" {= "1.14.0" & with-test} "result" {= "1.5" & with-dev-setup} "seq" {= "base"} "sexplib0" {= "v0.16.0"} "stdio" {= "v0.16.0" & with-dev-setup} "stdlib-shims" {= "0.3.0"} "terminal_size" {= "0.2.0"} - "topkg" {= "1.0.7"} - "uucp" {= "15.1.0" & with-dev-setup} - "uuseg" {= "15.1.0" & with-dev-setup} - "uutf" {= "1.0.3" & with-test} + "topkg" {= "1.1.1"} + "uucp" {= "17.0.0" & with-dev-setup} + "uuseg" {= "17.0.0" & with-dev-setup} + "uutf" {= "1.0.4" & with-test} "yojson" {= "2.2.2"} ] build: [ diff --git a/cs_api_client.opam.win.locked b/cs_api_client.opam.win.locked index dc2d2c4..baecf7a 100644 --- a/cs_api_client.opam.win.locked +++ b/cs_api_client.opam.win.locked @@ -8,40 +8,40 @@ license: "BSD-2-Clause" homepage: "https://github.com/cryptosense/api-client" bug-reports: "https://github.com/cryptosense/api-client/issues" depends: [ - "alcotest" {= "1.8.0" & with-test} + "alcotest" {= "1.9.1" & with-test} "arch-x86_64" {= "1"} "astring" {= "0.8.5" & with-test} - "base" {= "v0.16.3" & with-dev-setup} + "base" {= "v0.16.4" & with-dev-setup} "base-bigarray" {= "base"} "base-bytes" {= "base"} "base-threads" {= "base"} "base-unix" {= "base"} - "base64" {= "3.5.1"} + "base64" {= "3.5.2"} "camlp-streams" {= "5.0.1" & with-dev-setup} "cmdliner" {= "1.3.0"} "conf-bash" {= "1" & with-dev-setup} "conf-libcurl" {= "2"} "conf-mingw-w64-gcc-x86_64" {= "1"} - "containers" {= "3.13.1"} - "cppo" {= "1.6.9"} + "containers" {= "3.16"} + "cppo" {= "1.8.0"} "csexp" {= "1.5.2"} - "dune" {= "3.16.0"} - "dune-build-info" {= "3.16.0" & with-dev-setup} - "dune-configurator" {= "3.16.0"} + "dune" {= "3.20.2"} + "dune-build-info" {= "3.20.2" & with-dev-setup} + "dune-configurator" {= "3.20.2"} "either" {= "1.0.0"} - "fix" {= "20230505" & with-dev-setup} + "fix" {= "20250919" & with-dev-setup} "flexdll" {= "0.43"} - "fmt" {= "0.9.0"} + "fmt" {= "0.11.0"} "fpath" {= "0.7.3" & with-dev-setup} "host-arch-x86_64" {= "1"} "host-system-mingw" {= "1"} - "logs" {= "0.7.0"} - "lwt" {= "5.7.0"} - "lwt_ppx" {= "2.1.0"} - "menhir" {= "20240715" & with-dev-setup} - "menhirCST" {= "20240715" & with-dev-setup} - "menhirLib" {= "20240715" & with-dev-setup} - "menhirSdk" {= "20240715" & with-dev-setup} + "logs" {= "0.10.0"} + "lwt" {= "5.8.1"} + "lwt_ppx" {= "5.9.2"} + "menhir" {= "20250912" & with-dev-setup} + "menhirCST" {= "20250912" & with-dev-setup} + "menhirLib" {= "20250912" & with-dev-setup} + "menhirSdk" {= "20250912" & with-dev-setup} "mingw-w64-shims" {= "0.2.0"} "ocaml" {= "4.14.2"} "ocaml-base-compiler" {= "4.14.2"} @@ -50,18 +50,18 @@ depends: [ "ocaml-env-mingw64" {= "1"} "ocaml-options-vanilla" {= "1"} "ocaml-syntax-shims" {= "1.0.0" & with-test} - "ocaml-version" {= "3.6.7" & with-dev-setup} - "ocamlbuild" {= "0.15.0"} - "ocamlfind" {= "1.9.5"} + "ocaml-version" {= "4.0.3" & with-dev-setup} + "ocamlbuild" {= "0.16.1"} + "ocamlfind" {= "1.9.8"} "ocamlformat" {= "0.25.1" & with-dev-setup} "ocamlformat-lib" {= "0.25.1" & with-dev-setup} - "ocp-indent" {= "1.8.1" & with-dev-setup} + "ocp-indent" {= "1.9.0" & with-dev-setup} "ocplib-endian" {= "1.2"} "ocurl" {= "0.9.1"} "ppx_derivers" {= "1.2.1"} - "ppx_deriving" {= "6.0.2"} - "ppxlib" {= "0.33.0"} - "re" {= "1.11.0" & with-test} + "ppx_deriving" {= "6.1.1"} + "ppxlib" {= "0.37.0"} + "re" {= "1.14.0" & with-test} "result" {= "1.5" & with-dev-setup} "seq" {= "base"} "sexplib0" {= "v0.16.0"} @@ -69,10 +69,10 @@ depends: [ "stdlib-shims" {= "0.3.0"} "system-mingw" {= "1"} "terminal_size" {= "0.2.0"} - "topkg" {= "1.0.7"} - "uucp" {= "15.1.0" & with-dev-setup} - "uuseg" {= "15.1.0" & with-dev-setup} - "uutf" {= "1.0.3" & with-test} + "topkg" {= "1.1.1"} + "uucp" {= "17.0.0" & with-dev-setup} + "uuseg" {= "17.0.0" & with-dev-setup} + "uutf" {= "1.0.4" & with-test} "yojson" {= "2.2.2"} ] build: [