Skip to content

Fix the CI of the Eio packages #2

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

Open
balat wants to merge 5 commits into
base: eio
Choose a base branch
from
Open

Fix the CI of the Eio packages #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2036856
Only build the Eio neg_tests when eio_main is available
balat Oct 9, 2026
389ada2
Detach the neg_tests helper libraries from the multicoretests package
balat Oct 9, 2026
17f5d5f
Add eio_main as a test dependency of the Eio packages
balat Oct 9, 2026
c417e10
Require OCaml 5.1 for the Eio packages
balat Oct 9, 2026
34159fb
CI: name the Eio installation step
balat Oct 9, 2026
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/opam.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
run: |
opam install --with-test ./qcheck-multicoretests-util.opam ./qcheck-lin.opam ./qcheck-stm.opam

- name:
- name: Test installation of the Eio OPAM packages
if: matrix.test-eio == true
run: |
opam install --with-test ./qcheck-stm-eio.opam ./qcheck-lin-eio.opam
Expand Down
6 changes: 4 additions & 2 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ sequential and parallel tests against a declarative model.")
"model-based testing" "parallel testing"))
(depopts base-domains)
(depends
(ocaml (>= 4.12))
(ocaml (>= 5.1))
(qcheck-core (>= "0.90"))
(eio (>= "1.0"))
(eio_main (and (>= "1.0") :with-test))
(qcheck-multicoretests-util (= :version))
(qcheck-stm (= :version))))

Expand Down Expand Up @@ -76,9 +77,10 @@ and explained by some sequential interleaving.")
(tags ("test" "property" "qcheck" "quickcheck" "parallelism" "sequential consistency"))
(depopts base-domains)
(depends
(ocaml (>= 4.12))
(ocaml (>= 5.1))
(qcheck-core (>= "0.90"))
(eio (>= "1.0"))
(eio_main (and (>= "1.0") :with-test))
(qcheck-multicoretests-util (= :version))
(qcheck-lin (= :version))))

Expand Down
3 changes: 2 additions & 1 deletion qcheck-lin-eio.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ homepage: "https://github.com/ocaml-multicore/multicoretests"
bug-reports: "https://github.com/ocaml-multicore/multicoretests/issues"
depends: [
"dune" {>= "3.18"}
"ocaml" {>= "4.12"}
"ocaml" {>= "5.1"}
"qcheck-core" {>= "0.90"}
"eio" {>= "1.0"}
"eio_main" {>= "1.0" & with-test}
"qcheck-multicoretests-util" {= version}
"qcheck-lin" {= version}
"odoc" {with-doc}
Expand Down
3 changes: 2 additions & 1 deletion qcheck-stm-eio.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ homepage: "https://github.com/ocaml-multicore/multicoretests"
bug-reports: "https://github.com/ocaml-multicore/multicoretests/issues"
depends: [
"dune" {>= "3.18"}
"ocaml" {>= "4.12"}
"ocaml" {>= "5.1"}
"qcheck-core" {>= "0.90"}
"eio" {>= "1.0"}
"eio_main" {>= "1.0" & with-test}
"qcheck-multicoretests-util" {= version}
"qcheck-stm" {= version}
"odoc" {with-doc}
Expand Down
12 changes: 8 additions & 4 deletions src/neg_tests/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
(library
(name stm_tests_ref_spec)
(modules stm_tests_ref_spec)
(package multicoretests)
(libraries qcheck-core qcheck-stm.stm)
)

Expand Down Expand Up @@ -43,6 +42,8 @@
(name stm_tests_ref_eio)
(modules stm_tests_ref_eio)
(package qcheck-stm-eio)
; Eio is not a dependency of multicoretests: skip when it is missing
(build_if %{lib-available:eio_main})
(libraries stm_tests_ref_spec qcheck-stm-eio.domain eio eio_main)
; Hangs with the linux backend
(action
Expand All @@ -53,7 +54,6 @@
(library
(name CList)
(modules CList)
(package multicoretests)
)

(test
Expand Down Expand Up @@ -84,6 +84,8 @@
(name stm_tests_clist_eio)
(modules stm_tests_clist_spec stm_tests_clist_eio)
(package qcheck-stm-eio)
; Eio is not a dependency of multicoretests: skip when it is missing
(build_if %{lib-available:eio_main})
(libraries CList qcheck-stm-eio.domain eio eio_main)
; Hangs with the linux backend
(action
Expand All @@ -96,14 +98,12 @@
(library
(name lin_tests_common)
(modules lin_tests_common)
(package multicoretests)
(libraries CList qcheck-lin.lin)
)

(library
(name lin_internal_tests_common)
(modules lin_internal_tests_common)
(package multicoretests)
(libraries CList qcheck-lin.lin)
)

Expand Down Expand Up @@ -138,6 +138,8 @@
(name lin_tests_eio)
(modules lin_tests_eio)
(package qcheck-lin-eio)
; Eio is not a dependency of multicoretests: skip when it is missing
(build_if %{lib-available:eio_main})

@Julow Julow Oct 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't (package qcheck-lin-eio) above enough now that eio_main is a dependency ?

(flags (:standard -w -27))
(libraries lin_tests_common qcheck-lin-eio.domain eio eio_main)
; Hangs with the linux backend
Expand Down Expand Up @@ -182,6 +184,8 @@
(name lin_internal_tests_eio)
(modules lin_internal_tests_eio)
(package qcheck-lin-eio)
; Eio is not a dependency of multicoretests: skip when it is missing
(build_if %{lib-available:eio_main})
(flags (:standard -w -27))
(libraries lin_internal_tests_common qcheck-lin-eio.domain eio eio_main)
; (setenv EIO_BACKEND posix (run %{test} --verbose))
Expand Down