Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

maintenance: explicitely declare direct dependencies #4810

Merged
merged 2 commits into from
Oct 24, 2022
Merged

maintenance: explicitely declare direct dependencies #4810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
235cc40
maintenance: explicitely declare direct dependencies
psafont Mar 17, 2022
e1b5e71
ci: add xapi-log and xapi-open-uri
psafont Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
name: Ocaml tests
runs-on: ubuntu-20.04
env:
package: "xapi-cli-protocol xapi-client xapi-consts xapi-database xapi-datamodel xapi-types xapi xe xen-api-sdk xen-api-client xen-api-client-lwt xen-api-client-async xapi-rrdd xapi-rrdd-plugin xapi-rrd-transport xapi-rrd-transport-utils rrd-transport rrdd-plugin rrdd-plugins rrddump gzip http-svr pciutil safe-resources sexpr stunnel uuid xapi-compression xml-light2 zstd vhd-tool xapi-networkd xapi-squeezed xapi-xenopsd xapi-xenopsd-cli xapi-xenopsd-simulator xapi-xenopsd-xc message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli wsproxy xapi-nbd varstored-guard"
package: "xapi-cli-protocol xapi-client xapi-consts xapi-database xapi-datamodel xapi-types xapi xe xen-api-sdk xen-api-client xen-api-client-lwt xen-api-client-async xapi-rrdd xapi-rrdd-plugin xapi-rrd-transport xapi-rrd-transport-utils rrd-transport rrdd-plugin rrdd-plugins rrddump gzip http-svr pciutil safe-resources sexpr stunnel uuid xapi-compression xml-light2 zstd vhd-tool xapi-networkd xapi-squeezed xapi-xenopsd xapi-xenopsd-cli xapi-xenopsd-simulator xapi-xenopsd-xc message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli wsproxy xapi-nbd varstored-guard xapi-log xapi-open-uri"
XAPI_VERSION: "v0.0.0-${{ github.sha }}"

steps:
Expand Down
1 change: 1 addition & 0 deletions ocaml/alerts/certificate/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
(modules certificate_check_main)
(libraries
certificate_check
dune-build-info
http-svr
xapi-client
xapi-types
Expand Down
20 changes: 16 additions & 4 deletions ocaml/database/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
http-svr
uuid
xapi-backtrace
xapi-log
xapi-stdext-encodings
xapi-stdext-pervasives
xapi-stdext-std
xapi-stdext-threads
xapi-stdext-unix
xapi-idl
xml-light2
xmlm
)
Expand All @@ -42,8 +42,9 @@
(package xapi)
(modules block_device_io)
(libraries
dune-build-info
xapi-database
xapi-idl
xapi-log
xapi-stdext-pervasives
xapi-stdext-unix
uuid
Expand All @@ -55,10 +56,12 @@
(name database_server_main)
(modules database_server_main)
(libraries
dune-build-info
http-svr
threads.posix
xapi-database
threads
xapi-stdext-threads
http-svr
xapi-stdext-unix
)
)

Expand All @@ -68,7 +71,14 @@
(modules db_cache_test unit_test_marshall)
(libraries
alcotest
dune-build-info
http-svr
ppx_sexp_conv.runtime-lib
rpclib.xml
sexplib
sexplib0
xapi-database
xml-light2
)
)

Expand All @@ -81,7 +91,9 @@
)
(libraries
alcotest
dune-build-info
xapi-database
xml-light2
)
)

Expand Down
3 changes: 2 additions & 1 deletion ocaml/db_process/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
(public_name xapi-db-process)
(package xapi)
(libraries
dune-build-info
unix
xapi-inventory
xapi-database
xapi-idl
xapi-log
)
)

11 changes: 7 additions & 4 deletions ocaml/doc/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@
(modes byte exe)
(name jsapi)
(libraries
xapi-datamodel
dune-build-info
gzip
mustache
rpclib.core
rpclib.json
uuid
xapi-consts
xapi-datamodel
xapi-stdext-pervasives
xapi-stdext-std
xapi-stdext-unix
uuid
gzip
mustache
)
(preprocess (pps ppx_deriving_rpc))
)
Expand Down
1 change: 1 addition & 0 deletions ocaml/events/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
(public_name event_listen)
(package xapi)
(libraries
dune-build-info
http-svr
xapi-client
xapi-types
Expand Down
13 changes: 11 additions & 2 deletions ocaml/forkexecd/lib/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,16 @@
(name forkexec)
(public_name forkexec)
(wrapped false)
(libraries astring fd-send-recv rpclib.json threads uuid xapi-stdext-pervasives
xapi-stdext-unix)
(libraries
astring
fd-send-recv
rpclib.core
rpclib.json
uuid
xapi-backtrace
xapi-log
xapi-stdext-pervasives
xapi-stdext-unix
)
(preprocess
(pps ppx_deriving_rpc)))
10 changes: 9 additions & 1 deletion ocaml/forkexecd/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
(executable
(modes byte exe)
(name fe_main)
(libraries astring forkexec systemd uuid xapi-log xapi-stdext-unix))
(libraries
astring
fd-send-recv
forkexec
systemd
uuid
xapi-log
xapi-stdext-unix
))

(install
(package xapi-forkexecd)
Expand Down
2 changes: 1 addition & 1 deletion ocaml/forkexecd/test/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(executable
(modes byte exe)
(name fe_test)
(libraries forkexec xapi-stdext-unix))
(libraries forkexec uuid xapi-stdext-unix))

(rule
(alias runtest)
Expand Down
12 changes: 9 additions & 3 deletions ocaml/gencert/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
result
rresult
x509
xapi_aux
xapi-backtrace
xapi-consts
xapi-idl
xapi-log
xapi-inventory
xapi-stdext-unix
)
Expand All @@ -31,9 +31,12 @@
(modules gencert)
(libraries
astring
dune-build-info
gencertlib
x509
xapi-inventory
xapi-idl
xapi_aux
xapi-log
)
)

Expand All @@ -44,11 +47,14 @@
(libraries
alcotest
cstruct
dune-build-info
fmt
gencertlib
mirage-crypto
mirage-crypto-pk
mirage-crypto-rng.unix
ptime
result
rresult
x509
xapi-consts
Expand Down
10 changes: 9 additions & 1 deletion ocaml/idl/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,21 @@
(name datamodel_main)
(modules datamodel_main dot_backend dtd_backend markdown_backend)
(libraries
dune-build-info
xapi-datamodel
xapi-stdext-std
xapi-stdext-pervasives
xapi-stdext-unix
)
)

(test
(name schematest)
(modules schematest)
(libraries
dune-build-info
rpclib.core
rpclib.json
xapi_datamodel
)
(package xapi-datamodel)
Expand All @@ -47,8 +54,9 @@
(name gen_lifecycle)
(modules gen_lifecycle)
(libraries
dune-build-info
xapi-datamodel
xapi_version
xapi-consts.xapi_version
)
(promote (until-clean))
)
Expand Down
2 changes: 2 additions & 0 deletions ocaml/idl/json_backend/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
(modes byte exe)
(name gen_json)
(libraries
dune-build-info
fmt
xapi-datamodel
xapi-consts
xapi-stdext-unix
Expand Down
4 changes: 2 additions & 2 deletions ocaml/idl/ocaml_backend/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
(modes byte exe)
(name gen_api_main)
(libraries
dune-build-info
sexpr
threads
uuid
xapi-consts
xapi-datamodel
xapi-idl
xapi-log
xapi-stdext-pervasives
xapi-stdext-std
)
Expand Down
2 changes: 1 addition & 1 deletion ocaml/libs/gzip/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
(name gzip)
(public_name gzip)
(libraries
xapi-compression
(re_export xapi-compression)
)
)

37 changes: 21 additions & 16 deletions ocaml/libs/http-svr/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@
(libraries
astring
base64
mtime
mtime.clock.os
polly
rpclib
rpclib.core
rpclib.json
rpclib.xml
safe_resources
sha
stunnel
threads.posix
uuid
xapi-backtrace
xapi-consts.xapi_version
xapi-idl
xapi-idl.updates
xapi-log
xapi-stdext-date
Expand All @@ -30,16 +35,18 @@
(name http_test)
(modules http_test)
(libraries
dune-build-info
http-svr
oUnit
ounit2
)
)

(executable
(modes byte exe)
(test
(name radix_tree_test)
(modules radix_tree_test)
(package http-svr)
(libraries
dune-build-info
http-svr
)
)
Expand All @@ -49,8 +56,12 @@
(name test_client)
(modules test_client)
(libraries
dune-build-info
http-svr
oUnit
ounit2
safe-resources
stunnel
threads.posix
xapi-stdext-pervasives
xapi-stdext-unix
)
Expand All @@ -61,8 +72,11 @@
(name test_server)
(modules test_server)
(libraries
dune-build-info
http-svr
oUnit
ounit2
safe-resources
threads.posix
xapi-stdext-threads
xapi-stdext-unix
)
Expand All @@ -77,15 +91,6 @@
(action (run %{x} -runner sequential -verbose true))
)

(rule
(alias runtest)
(package http-svr)
(deps
(:x radix_tree_test.exe)
)
(action (run %{x}))
)

(rule
(alias runtest)
(package http-svr)
Expand Down
5 changes: 4 additions & 1 deletion ocaml/libs/log/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
(names syslog_stubs))
(libraries
astring
logs
threads.posix
xapi-backtrace
xapi-stdext-pervasives
)
(wrapped false)
)
)
3 changes: 3 additions & 0 deletions ocaml/libs/open-uri/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
(public_name xapi-open-uri)
(libraries
cohttp
safe-resources
stunnel
uri
xapi-backtrace
xapi-consts
xapi-log
xapi-stdext-pervasives
Expand Down
1 change: 1 addition & 0 deletions ocaml/libs/resources/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
logs
xapi-backtrace
fmt
threads.posix
xapi-stdext-pervasives
xapi-stdext-threads
)
Expand Down
Loading