Skip to content

Commit f800d60

Browse files
bertrand-sbbertrand-sb
authored
Merge pull request #55 from cryptosense/update
Update dependencies and fix CI
2 parents f92fc89 + 8c65263 commit f800d60

File tree

5 files changed

+67
-67
lines changed

5 files changed

+67
-67
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ ca_path = "/path/to/self-signed-cert.pem"
125125
profile_id = 1
126126
project_id = 3
127127
slot_name = "cs-api-test"
128+
is_default_url = false
128129
```
129130
130131
## Updating dependencies

‎cs_api_cli/cs_api_cli.ml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -376,20 +376,21 @@ module Common = struct
376376
in
377377
let color = Cmdliner.Arg.info ["color"] ~docs ~doc in
378378
let parser = function
379-
| "auto" -> `Ok Color.Auto
380-
| "always" -> `Ok Color.Always
381-
| "never" -> `Ok Color.Never
379+
| "auto" -> Ok Color.Auto
380+
| "always" -> Ok Color.Always
381+
| "never" -> Ok Color.Never
382382
| _ as s ->
383-
`Error
384-
(Printf.sprintf
385-
"Invalid color: %s. Expected: 'auto', 'always' or 'never'." s)
383+
Error
384+
(`Msg
385+
(Printf.sprintf
386+
"Invalid color: %s. Expected: 'auto', 'always' or 'never'." s))
386387
in
387388
let printer fmt = function
388389
| Color.Auto -> Fmt.string fmt "auto"
389390
| Color.Always -> Fmt.string fmt "always"
390391
| Color.Never -> Fmt.string fmt "never"
391392
in
392-
Cmdliner.Arg.(value & opt (parser, printer) Color.Auto color)
393+
Cmdliner.Arg.(value & opt (conv (parser, printer)) Color.Auto color)
393394
in
394395
let verbosity =
395396
let doc =

‎cs_api_client.opam‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ depends: [
1717
"cmdliner" {>= "1.2.0"}
1818
"containers" {>= "3.6"}
1919
"dune" {>= "2.7.0"}
20+
"fmt" {>= "0.11.0"}
2021
"logs" {>= "0.7.0"}
21-
"lwt"
22+
"lwt" {< "5.9.0"} # For compilation on CentOS 7
2223
"lwt_ppx"
2324
"ocaml" {>= "4.14.0"}
2425
"ocamlformat" {= "0.25.1" & with-dev-setup}

‎cs_api_client.opam.locked‎

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,65 +8,62 @@ license: "BSD-2-Clause"
88
homepage: "https://github.com/cryptosense/api-client"
99
bug-reports: "https://github.com/cryptosense/api-client/issues"
1010
depends: [
11-
"alcotest" {= "1.7.0" & with-test}
11+
"alcotest" {= "1.9.1" & with-test}
1212
"astring" {= "0.8.5" & with-test}
13-
"base" {= "v0.16.3" & with-dev-setup}
13+
"base" {= "v0.16.4" & with-dev-setup}
1414
"base-bigarray" {= "base"}
1515
"base-bytes" {= "base"}
1616
"base-threads" {= "base"}
1717
"base-unix" {= "base"}
18-
"base64" {= "3.5.1"}
18+
"base64" {= "3.5.2"}
1919
"camlp-streams" {= "5.0.1" & with-dev-setup}
2020
"cmdliner" {= "1.3.0"}
21-
"conf-bash" {= "1" & with-dev-setup}
2221
"conf-libcurl" {= "2"}
23-
"containers" {= "3.13.1"}
24-
"cppo" {= "1.6.9"}
22+
"containers" {= "3.16"}
23+
"cppo" {= "1.8.0"}
2524
"csexp" {= "1.5.2"}
26-
"dune" {= "3.16.0"}
27-
"dune-build-info" {= "3.16.0" & with-dev-setup}
28-
"dune-configurator" {= "3.16.0"}
25+
"dune" {= "3.20.2"}
26+
"dune-build-info" {= "3.20.2" & with-dev-setup}
27+
"dune-configurator" {= "3.20.2"}
2928
"either" {= "1.0.0"}
30-
"fix" {= "20230505" & with-dev-setup}
31-
"fmt" {= "0.9.0"}
29+
"fix" {= "20250919" & with-dev-setup}
30+
"fmt" {= "0.11.0"}
3231
"fpath" {= "0.7.3" & with-dev-setup}
33-
"host-arch-x86_64" {= "1"}
34-
"host-system-other" {= "1"}
35-
"logs" {= "0.7.0"}
36-
"lwt" {= "5.7.0"}
37-
"lwt_ppx" {= "2.1.0"}
38-
"menhir" {= "20240715" & with-dev-setup}
39-
"menhirCST" {= "20240715" & with-dev-setup}
40-
"menhirLib" {= "20240715" & with-dev-setup}
41-
"menhirSdk" {= "20240715" & with-dev-setup}
32+
"logs" {= "0.10.0"}
33+
"lwt" {= "5.8.1"}
34+
"lwt_ppx" {= "5.9.2"}
35+
"menhir" {= "20250912" & with-dev-setup}
36+
"menhirCST" {= "20250912" & with-dev-setup}
37+
"menhirLib" {= "20250912" & with-dev-setup}
38+
"menhirSdk" {= "20250912" & with-dev-setup}
4239
"ocaml" {= "4.14.2"}
4340
"ocaml-base-compiler" {= "4.14.2"}
4441
"ocaml-compiler-libs" {= "v0.12.4"}
4542
"ocaml-config" {= "2"}
4643
"ocaml-options-vanilla" {= "1"}
4744
"ocaml-syntax-shims" {= "1.0.0" & with-test}
48-
"ocaml-version" {= "3.6.7" & with-dev-setup}
49-
"ocamlbuild" {= "0.15.0"}
50-
"ocamlfind" {= "1.9.6"}
45+
"ocaml-version" {= "4.0.3" & with-dev-setup}
46+
"ocamlbuild" {= "0.16.1"}
47+
"ocamlfind" {= "1.9.8"}
5148
"ocamlformat" {= "0.25.1" & with-dev-setup}
5249
"ocamlformat-lib" {= "0.25.1" & with-dev-setup}
53-
"ocp-indent" {= "1.8.1" & with-dev-setup}
50+
"ocp-indent" {= "1.9.0" & with-dev-setup}
5451
"ocplib-endian" {= "1.2"}
5552
"ocurl" {= "0.9.1"}
5653
"ppx_derivers" {= "1.2.1"}
57-
"ppx_deriving" {= "6.0.2"}
58-
"ppxlib" {= "0.33.0"}
59-
"re" {= "1.11.0" & with-test}
54+
"ppx_deriving" {= "6.1.1"}
55+
"ppxlib" {= "0.37.0"}
56+
"re" {= "1.14.0" & with-test}
6057
"result" {= "1.5" & with-dev-setup}
6158
"seq" {= "base"}
6259
"sexplib0" {= "v0.16.0"}
6360
"stdio" {= "v0.16.0" & with-dev-setup}
6461
"stdlib-shims" {= "0.3.0"}
6562
"terminal_size" {= "0.2.0"}
66-
"topkg" {= "1.0.7"}
67-
"uucp" {= "15.1.0" & with-dev-setup}
68-
"uuseg" {= "15.1.0" & with-dev-setup}
69-
"uutf" {= "1.0.3" & with-test}
63+
"topkg" {= "1.1.1"}
64+
"uucp" {= "17.0.0" & with-dev-setup}
65+
"uuseg" {= "17.0.0" & with-dev-setup}
66+
"uutf" {= "1.0.4" & with-test}
7067
"yojson" {= "2.2.2"}
7168
]
7269
build: [

‎cs_api_client.opam.win.locked‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,40 @@ license: "BSD-2-Clause"
88
homepage: "https://github.com/cryptosense/api-client"
99
bug-reports: "https://github.com/cryptosense/api-client/issues"
1010
depends: [
11-
"alcotest" {= "1.8.0" & with-test}
11+
"alcotest" {= "1.9.1" & with-test}
1212
"arch-x86_64" {= "1"}
1313
"astring" {= "0.8.5" & with-test}
14-
"base" {= "v0.16.3" & with-dev-setup}
14+
"base" {= "v0.16.4" & with-dev-setup}
1515
"base-bigarray" {= "base"}
1616
"base-bytes" {= "base"}
1717
"base-threads" {= "base"}
1818
"base-unix" {= "base"}
19-
"base64" {= "3.5.1"}
19+
"base64" {= "3.5.2"}
2020
"camlp-streams" {= "5.0.1" & with-dev-setup}
2121
"cmdliner" {= "1.3.0"}
2222
"conf-bash" {= "1" & with-dev-setup}
2323
"conf-libcurl" {= "2"}
2424
"conf-mingw-w64-gcc-x86_64" {= "1"}
25-
"containers" {= "3.13.1"}
26-
"cppo" {= "1.6.9"}
25+
"containers" {= "3.16"}
26+
"cppo" {= "1.8.0"}
2727
"csexp" {= "1.5.2"}
28-
"dune" {= "3.16.0"}
29-
"dune-build-info" {= "3.16.0" & with-dev-setup}
30-
"dune-configurator" {= "3.16.0"}
28+
"dune" {= "3.20.2"}
29+
"dune-build-info" {= "3.20.2" & with-dev-setup}
30+
"dune-configurator" {= "3.20.2"}
3131
"either" {= "1.0.0"}
32-
"fix" {= "20230505" & with-dev-setup}
32+
"fix" {= "20250919" & with-dev-setup}
3333
"flexdll" {= "0.43"}
34-
"fmt" {= "0.9.0"}
34+
"fmt" {= "0.11.0"}
3535
"fpath" {= "0.7.3" & with-dev-setup}
3636
"host-arch-x86_64" {= "1"}
3737
"host-system-mingw" {= "1"}
38-
"logs" {= "0.7.0"}
39-
"lwt" {= "5.7.0"}
40-
"lwt_ppx" {= "2.1.0"}
41-
"menhir" {= "20240715" & with-dev-setup}
42-
"menhirCST" {= "20240715" & with-dev-setup}
43-
"menhirLib" {= "20240715" & with-dev-setup}
44-
"menhirSdk" {= "20240715" & with-dev-setup}
38+
"logs" {= "0.10.0"}
39+
"lwt" {= "5.8.1"}
40+
"lwt_ppx" {= "5.9.2"}
41+
"menhir" {= "20250912" & with-dev-setup}
42+
"menhirCST" {= "20250912" & with-dev-setup}
43+
"menhirLib" {= "20250912" & with-dev-setup}
44+
"menhirSdk" {= "20250912" & with-dev-setup}
4545
"mingw-w64-shims" {= "0.2.0"}
4646
"ocaml" {= "4.14.2"}
4747
"ocaml-base-compiler" {= "4.14.2"}
@@ -50,29 +50,29 @@ depends: [
5050
"ocaml-env-mingw64" {= "1"}
5151
"ocaml-options-vanilla" {= "1"}
5252
"ocaml-syntax-shims" {= "1.0.0" & with-test}
53-
"ocaml-version" {= "3.6.7" & with-dev-setup}
54-
"ocamlbuild" {= "0.15.0"}
55-
"ocamlfind" {= "1.9.5"}
53+
"ocaml-version" {= "4.0.3" & with-dev-setup}
54+
"ocamlbuild" {= "0.16.1"}
55+
"ocamlfind" {= "1.9.8"}
5656
"ocamlformat" {= "0.25.1" & with-dev-setup}
5757
"ocamlformat-lib" {= "0.25.1" & with-dev-setup}
58-
"ocp-indent" {= "1.8.1" & with-dev-setup}
58+
"ocp-indent" {= "1.9.0" & with-dev-setup}
5959
"ocplib-endian" {= "1.2"}
6060
"ocurl" {= "0.9.1"}
6161
"ppx_derivers" {= "1.2.1"}
62-
"ppx_deriving" {= "6.0.2"}
63-
"ppxlib" {= "0.33.0"}
64-
"re" {= "1.11.0" & with-test}
62+
"ppx_deriving" {= "6.1.1"}
63+
"ppxlib" {= "0.37.0"}
64+
"re" {= "1.14.0" & with-test}
6565
"result" {= "1.5" & with-dev-setup}
6666
"seq" {= "base"}
6767
"sexplib0" {= "v0.16.0"}
6868
"stdio" {= "v0.16.0" & with-dev-setup}
6969
"stdlib-shims" {= "0.3.0"}
7070
"system-mingw" {= "1"}
7171
"terminal_size" {= "0.2.0"}
72-
"topkg" {= "1.0.7"}
73-
"uucp" {= "15.1.0" & with-dev-setup}
74-
"uuseg" {= "15.1.0" & with-dev-setup}
75-
"uutf" {= "1.0.3" & with-test}
72+
"topkg" {= "1.1.1"}
73+
"uucp" {= "17.0.0" & with-dev-setup}
74+
"uuseg" {= "17.0.0" & with-dev-setup}
75+
"uutf" {= "1.0.4" & with-test}
7676
"yojson" {= "2.2.2"}
7777
]
7878
build: [

0 commit comments

Comments
 (0)