Skip to content

Build: Use dune 3.19 #1957

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.

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 3 deletions .github/workflows/build-wasm_of_ocaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,10 @@ jobs:
- run: opam install conf-pkg-config conf-mingw-w64-gcc-i686 conf-mingw-w64-g++-x86_64
if: runner.os == 'Windows'

- name: Pin dune
if: runner.os == 'Windows'
run: opam pin add -n dune https://github.com/hhugo/dune.git#shorter-path-jsoo
# Pin Dune to a version which supports the new --effects flag
# (https://github.com/ocaml/dune/pull/11222).
- name: Pin Dune
run: opam pin add --no-action dune https://github.com/OlivierNicole/dune.git#jsoo-effects

- name: Install dune
run: opam install dune
Expand Down
6 changes: 3 additions & 3 deletions compiler/tests-dynlink-js/effects_flags.ml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ let () =
let effects_flags l =
match l, major >= 5 with
| [ "with-effects-double-translation" ], true -> [ "--effects"; "double-translation" ]
| [ "with-effects" ], true -> [ "--enable"; "effects" ]
| _, true -> [ "--disable"; "effects" ]
| _, false -> [ "--disable"; "effects" ]
| [ "with-effects" ], true -> [ "--effects"; "cps" ]
| _, true -> []
| _, false -> []
in
match Sys.argv |> Array.to_list |> List.tl with
| "txt" :: rest -> List.iter print_endline (effects_flags rest)
Expand Down
2 changes: 1 addition & 1 deletion compiler/tests-jsoo/lib-effects/dune
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
(_
(js_of_ocaml
(flags
(:standard --enable effects)))))
(:standard --effects cps)))))

(library
(name jsoo_testsuite_effect)
Expand Down
2 changes: 1 addition & 1 deletion compiler/tests-ocaml/effect-syntax/dune
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
(_
(js_of_ocaml
(flags
(:standard --enable effects)))))
(:standard --effects cps)))))

(tests
(names
Expand Down
2 changes: 1 addition & 1 deletion compiler/tests-ocaml/effects/dune
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
(_
(js_of_ocaml
(flags
(:standard --enable effects)))))
(:standard --effects cps)))))

(tests
(build_if
Expand Down
4 changes: 2 additions & 2 deletions dune
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
(js_of_ocaml
(compilation_mode separate)
(flags
(:standard --enable effects)))
(:standard --effects cps)))
(wasm_of_ocaml
(compilation_mode separate)
(flags
(:standard --enable effects)))
(:standard --effects cps)))
(binaries
(tools/node_wrapper.exe as node)
(tools/node_wrapper.exe as node.exe)))
Expand Down
5 changes: 3 additions & 2 deletions toplevel/examples/lwt_toplevel/effects_flags.ml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ let () =
let effects_flags l =
match l, major >= 5 with
| [ "with-effects-double-translation" ], true -> [ "--effects"; "double-translation" ]
| _, true -> [ "--enable"; "effects" ]
| _, false -> [ "--disable"; "effects" ]
| [ "with-effects" ], true -> [ "--effects"; "cps" ]
| _, true -> [ "--effects"; "cps" ]
| _, false -> []
in
match Sys.argv |> Array.to_list |> List.tl with
| "txt" :: rest -> List.iter print_endline (effects_flags rest)
Expand Down
Loading