Skip to content

Commit

Permalink
chore: use 5.2 in CI (#28)
Browse files Browse the repository at this point in the history
chore: use 5.2 in CI
  • Loading branch information
c-cube authored May 20, 2024
1 parent 0750e6a commit a4db1e6
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 25 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
ocaml-compiler:
- '4.08'
- '4.14'
- '5.1'
- '5.2'

runs-on: ${{ matrix.os }}
steps:
Expand All @@ -31,14 +31,14 @@ jobs:
allow-prerelease-opam: true

- run: opam install -t moonpool moonpool-lwt --deps-only
if: matrix.ocaml-compiler == '5.1'
if: matrix.ocaml-compiler == '5.2'
- run: opam install -t moonpool --deps-only
if: matrix.ocaml-compiler != '5.1'
if: matrix.ocaml-compiler != '5.2'
- run: opam exec -- dune build @install

# install some depopts
- run: opam install thread-local-storage trace domain-local-await
if: matrix.ocaml-compiler == '5.1'
if: matrix.ocaml-compiler == '5.2'

- run: opam exec -- dune build --profile=release --force @install @runtest

Expand All @@ -52,7 +52,7 @@ jobs:
- macos-latest
#- windows-latest
ocaml-compiler:
- '5.1'
- '5.2'
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@main
Expand All @@ -74,7 +74,7 @@ jobs:
strategy:
matrix:
ocaml-compiler:
- '5.1'
- '5.2'
runs-on: 'ubuntu-latest'
steps:
- uses: actions/checkout@main
Expand All @@ -85,6 +85,6 @@ jobs:
dune-cache: true
allow-prerelease-opam: true

- run: opam install ocamlformat.0.24.1
- run: opam install ocamlformat.0.26.2
- run: opam exec -- make format-check

2 changes: 1 addition & 1 deletion .ocamlformat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 0.24.1
version = 0.26.2
profile=conventional
margin=80
if-then-else=k-r
Expand Down
6 changes: 3 additions & 3 deletions benchs/pi.ml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ let () =
Printf.printf "pi=%.6f (pi=%.6f, diff=%.3f)%s\n%!" res Float.pi
(abs_float (Float.pi -. res))
(if !time then
spf " in %.4fs" elapsed
else
"");
spf " in %.4fs" elapsed
else
"");
()
13 changes: 6 additions & 7 deletions src/lwt/IO_in.ml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
open Common_

class type t =
object
method input : bytes -> int -> int -> int
(** Read into the slice. Returns [0] only if the
class type t = object
method input : bytes -> int -> int -> int
(** Read into the slice. Returns [0] only if the
stream is closed. *)

method close : unit -> unit
(** Close the input. Must be idempotent. *)
end
method close : unit -> unit
(** Close the input. Must be idempotent. *)
end

let create ?(close = ignore) ~input () : t =
object
Expand Down
13 changes: 6 additions & 7 deletions src/lwt/IO_out.ml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
open Common_

class type t =
object
method output_char : char -> unit
method output : bytes -> int -> int -> unit
method flush : unit -> unit
method close : unit -> unit
end
class type t = object
method output_char : char -> unit
method output : bytes -> int -> int -> unit
method flush : unit -> unit
method close : unit -> unit
end

let create ?(flush = ignore) ?(close = ignore) ~output_char ~output () : t =
object
Expand Down

0 comments on commit a4db1e6

Please sign in to comment.