Skip to content
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

Support for OCaml trunk #1487

Closed
wants to merge 2 commits into from
Closed

Support for OCaml trunk #1487

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
6ccb19b
Misc: promote to 5.3
hhugo Dec 4, 2023
23e65ab
fix
hhugo Dec 5, 2024
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.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
- "4.13"
- "5.0"
- "5.1"
- "5.2"
skip-test:
- true
skip-doc:
Expand Down Expand Up @@ -53,7 +54,7 @@ jobs:
skip-test: false
skip-doc: true
- os: ubuntu-latest
ocaml-compiler: "5.2"
ocaml-compiler: "ocaml-compiler.5.3.0~beta2"
skip-effects: false
skip-test: false
skip-doc: false
Expand All @@ -64,12 +65,12 @@ jobs:
skip-test: true # the `time_now.0.17` package is pulled and doesn't work in 32 bits :(
skip-doc: true
- os: macos-latest
ocaml-compiler: "5.2"
ocaml-compiler: "ocaml-compiler.5.3.0~beta2"
skip-effects: true
skip-test: false
skip-doc: true
- os: windows-latest
ocaml-compiler: "5.2"
ocaml-compiler: "ocaml-compiler.5.3.0~beta2"
skip-effects: false
skip-test: false
skip-doc: true
Expand Down
2 changes: 0 additions & 2 deletions compiler/tests-check-prim/main.output5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Missing
From main.bc:
caml_alloc_dummy_function
caml_continuation_use
caml_drop_continuation
caml_int_as_pointer
caml_reset_afl_instrumentation
debugger
Expand Down Expand Up @@ -129,7 +128,6 @@ caml_set_static_env
caml_sys_const_naked_pointers_checked

From +toplevel.js:
caml_get_section_table
jsoo_toplevel_init_compile
jsoo_toplevel_init_reloc

Expand Down
2 changes: 0 additions & 2 deletions compiler/tests-check-prim/unix-unix.output5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Missing
From unix.bc:
caml_alloc_dummy_function
caml_continuation_use
caml_drop_continuation
caml_int_as_pointer
caml_reset_afl_instrumentation
caml_unix_accept
Expand Down Expand Up @@ -240,7 +239,6 @@ caml_set_static_env
caml_sys_const_naked_pointers_checked

From +toplevel.js:
caml_get_section_table
jsoo_toplevel_init_compile
jsoo_toplevel_init_reloc

Expand Down
6 changes: 3 additions & 3 deletions compiler/tests-full/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(rule
(targets stdlib.cma.js)
(enabled_if
(= %{ocaml_version} "5.2.0"))
(> %{ocaml_version} "5.2.0"))
(action
(run
%{bin:js_of_ocaml}
Expand All @@ -14,7 +14,7 @@
(rule
(targets stdlib.cma.output.js)
(enabled_if
(= %{ocaml_version} "5.2.0"))
(> %{ocaml_version} "5.2.0"))
(action
(with-stdout-to
%{targets}
Expand All @@ -23,7 +23,7 @@
(rule
(alias runtest)
(enabled_if
(= %{ocaml_version} "5.2.0"))
(> %{ocaml_version} "5.2.0"))
(action
(diff stdlib.cma.expected.js stdlib.cma.output.js)))

Expand Down
Loading
Loading