Skip to content

Fix building of all opam packages for xs-opam's CI #6377

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

Merged
merged 2 commits into from
Mar 20, 2025
Merged

Fix building of all opam packages for xs-opam's CI #6377

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
c94207e
forkexecd: do not tie vfork_helper to the forkexec package
psafont Mar 20, 2025
cecdcba
opam: add missing dependencies to packages
psafont Mar 20, 2025
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
7 changes: 5 additions & 2 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@
re
result
rpclib
rrdd-plugin
rresult
sexplib
sexplib0
Expand Down Expand Up @@ -315,6 +316,7 @@
; 'xapi-tools' will have version ~dev, not 'master' like all the others
; because it is not in xs-opam yet
rrd-transport
rrdd-plugin
xapi-tracing-export
xen-api-client
(alcotest :with-test)
Expand Down Expand Up @@ -721,10 +723,11 @@ This package provides an Lwt compatible interface to the library.")
base-threads
base-unix
(alcotest :with-test)
(clock (= :version))
(fmt :with-test)
(odoc :with-doc)
mtime
(xapi-log (= :version))
(xapi-stdext-pervasives (= :version))
(mtime :with-test)
(xapi-stdext-unix (= :version))
)
)
Expand Down
1 change: 0 additions & 1 deletion ocaml/forkexecd/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
(rule
(deps (source_tree helper))
(targets vfork_helper)
(package forkexec)
(action
(no-infer
(progn
Expand Down
1 change: 1 addition & 0 deletions xapi-debug.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ depends: [
"re"
"result"
"rpclib"
"rrdd-plugin"
"rresult"
"sexplib"
"sexplib0"
Expand Down
6 changes: 4 additions & 2 deletions xapi-stdext-threads.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ depends: [
"base-threads"
"base-unix"
"alcotest" {with-test}
"clock" {= version}
"fmt" {with-test}
"odoc" {with-doc}
"mtime"
"xapi-log" {= version}
"xapi-stdext-pervasives" {= version}
"mtime" {with-test}
"xapi-stdext-unix" {= version}
"odoc" {with-doc}
]
build: [
["dune" "subst"] {dev}
Expand Down
1 change: 1 addition & 0 deletions xapi-tools.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ depends: [
"xmlm"
"yojson"
"rrd-transport"
"rrdd-plugin"
"xapi-tracing-export"
"xen-api-client"
"alcotest" {with-test}
Expand Down
Loading