Skip to content

Commit c97b887

Browse files
Merge pull request #980 from ocsigen/add-ocaml5-in-the-ci
Add ocaml5 in the ci
2 parents 0c30d6c + 6e09218 commit c97b887

File tree

4 files changed

+2
-64
lines changed

4 files changed

+2
-64
lines changed

.github/workflows/workflow.yml

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,68 +22,54 @@ jobs:
2222
- 4.12.x
2323
- 4.13.x
2424
- 4.14.x
25+
- 5.0.x
2526
libev:
2627
- true
2728
- false
2829
ppx:
2930
- true
30-
domain:
31-
- false
3231
local-packages:
3332
- |
3433
*.opam
35-
!lwt_domain.opam
3634
include:
3735
- os: ubuntu-latest
3836
ocaml-compiler: ocaml-variants.4.14.0+options,ocaml-option-flambda,ocaml-option-musl,ocaml-option-static
3937
libev: false
4038
ppx: true
41-
domain: false
4239
local-packages: |
4340
*.opam
44-
!lwt_domain.opam
4541
- os: macos-latest
4642
ocaml-compiler: 4.14.x
4743
libev: true
4844
ppx: true
49-
domain: false
5045
local-packages: |
5146
*.opam
52-
!lwt_domain.opam
5347
- os: windows-latest
5448
ocaml-compiler: 4.14.x
5549
libev: false
5650
ppx: true
57-
domain: false
5851
local-packages: |
5952
*.opam
60-
!lwt_domain.opam
6153
- os: ubuntu-latest
6254
ocaml-compiler: 4.08.x
6355
libev: true
6456
ppx: false
65-
domain: false
6657
local-packages: |
6758
*.opam
68-
!lwt_domain.opam
6959
!lwt_ppx.opam
7060
- os: macos-latest
7161
ocaml-compiler: 4.08.x
7262
libev: true
7363
ppx: false
74-
domain: false
7564
local-packages: |
7665
*.opam
77-
!lwt_domain.opam
7866
!lwt_ppx.opam
7967
- os: windows-latest
8068
ocaml-compiler: 4.08.x
8169
libev: false
8270
ppx: false
83-
domain: false
8471
local-packages: |
8572
*.opam
86-
!lwt_domain.opam
8773
!lwt_ppx.opam
8874
8975
runs-on: ${{ matrix.os }}
@@ -112,24 +98,15 @@ jobs:
11298
- run: opam install lwt_ppx --deps-only --with-test
11399
if: ${{ matrix.ppx == true }}
114100

115-
- run: opam install lwt_domain --deps-only --with-test
116-
if: ${{ matrix.domain == true }}
117-
118101
- run: opam exec -- dune build --only-packages lwt_luv,lwt_react,lwt
119102

120103
- run: opam exec -- dune build --only-packages lwt_ppx
121104
if: ${{ matrix.ppx == true }}
122105

123-
- run: opam exec -- dune build --only-packages lwt_domain
124-
if: ${{ matrix.domain == true }}
125-
126106
- run: opam exec -- dune runtest --only-packages lwt_luv,lwt_react,lwt
127107

128108
- run: opam exec -- dune runtest --only-packages lwt_ppx
129109
if: ${{ matrix.ppx == true }}
130110

131-
- run: opam exec -- dune runtest --only-packages lwt_domain
132-
if: ${{ matrix.domain == true }}
133-
134111
- run: opam exec -- make ppx_let-test-deps ppx_let-test
135112
if: ${{ matrix.ppx == true }}

docs/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,18 @@ PKGS=\
55
-package bytes -package result \
66
-package bigarray -package unix \
77
-package ocaml-migrate-parsetree -package ppx_tools_versioned \
8-
-package react \
9-
-package domainslib
8+
-package react
109

1110
INCS=\
1211
-I ${BLD}/core/.lwt.objs/byte \
1312
-I ${BLD}/ppx/.ppx_lwt.objs/byte \
1413
-I ${BLD}/react/.lwt_react.objs/byte \
15-
-I ${BLD}/domain/.lwt_domain.objs/byte \
1614
-I ${BLD}/unix/.lwt_unix.objs/byte
1715

1816
MLIS=\
1917
$(wildcard ${SRC}/core/*.mli) \
2018
$(wildcard ${SRC}/ppx/*.mli) \
2119
$(wildcard ${SRC}/react/*.mli) \
22-
$(wildcard ${SRC}/domain/*.mli) \
2320
$(filter-out ${BLD}/unix/lwt_unix.cppo.mli,$(wildcard ${BLD}/unix/*.mli))
2421

2522
MLIS := $(filter-out %.pp.mli,$(MLIS))

docs/apiref-intro

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,6 @@ Syntactic sugar for Lwt, such as [let%lwt x = e in e'] syntax for [bind].
7171
Ppx_lwt
7272
}
7373

74-
{2 Multicore helpers}
75-
76-
The {e lwt_domain} package provides helpers for executing some computations on
77-
different cores. It is an Lwt-specific abstraction over the {e domainslib}
78-
package.
79-
80-
{!modules:
81-
Lwt_domain
82-
}
83-
84-
This package depends on the {e core} library and the {e domainslib} package.
85-
8674
{2 Miscellaneous}
8775

8876
The following modules are wrapper for integration of non-Lwt

docs/manual.wiki

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -730,30 +730,6 @@ let () =
730730

731731
== Other libraries ==
732732

733-
=== Parallelise computations to other cores ===
734-
735-
If you have some compute-intensive steps within your program, you can execute
736-
them on a separate core. You can get performance benefits from the
737-
parallelisation. In addition, whilst your compute-intensive function is running
738-
on a different core, your normal I/O-bound tasks continue running on the
739-
original core.
740-
741-
The module {{{Lwt_domain}}} from the {{{lwt_domain}}} package provides all the
742-
necessary helpers to achieve this. It is based on the {{{Domainslib}}} library
743-
and uses similar concepts (such as tasks and pools).
744-
745-
First, you need to create a task pool:
746-
747-
<<code language="ocaml" |val setup_pool : ?name:string -> int -> pool
748-
>>
749-
750-
Then you simple detach the function calls to the created pool:
751-
752-
<<code language="ocaml" |val detach : pool -> ('a -> 'b) -> 'a -> 'b Lwt.t
753-
>>
754-
755-
The returned promise resolves as soon as the function returns.
756-
757733
=== Detaching computation to preemptive threads ===
758734

759735
It may happen that you want to run a function which will take time to

0 commit comments

Comments
 (0)