Skip to content

Commit 2325cea

Browse files
committed
Misc: promote to 5.3
1 parent 9cfbfc4 commit 2325cea

File tree

8 files changed

+4957
-4335
lines changed

8 files changed

+4957
-4335
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
- "4.13"
2626
- "5.0"
2727
- "5.1"
28+
- "5.2"
2829
skip-test:
2930
- true
3031
skip-doc:
@@ -53,7 +54,7 @@ jobs:
5354
skip-test: false
5455
skip-doc: true
5556
- os: ubuntu-latest
56-
ocaml-compiler: "5.2"
57+
ocaml-compiler: "ocaml-compiler.5.3.0~beta2"
5758
skip-effects: false
5859
skip-test: false
5960
skip-doc: false
@@ -64,12 +65,12 @@ jobs:
6465
skip-test: true # the `time_now.0.17` package is pulled and doesn't work in 32 bits :(
6566
skip-doc: true
6667
- os: macos-latest
67-
ocaml-compiler: "5.2"
68+
ocaml-compiler: "ocaml-compiler.5.3.0~beta2"
6869
skip-effects: true
6970
skip-test: false
7071
skip-doc: true
7172
- os: windows-latest
72-
ocaml-compiler: "5.2"
73+
ocaml-compiler: "ocaml-compiler.5.3.0~beta2"
7374
skip-effects: false
7475
skip-test: false
7576
skip-doc: true

compiler/tests-check-prim/main.output5

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ Missing
44
From main.bc:
55
caml_alloc_dummy_function
66
caml_continuation_use
7-
caml_drop_continuation
87
caml_int_as_pointer
98
caml_reset_afl_instrumentation
109
debugger
@@ -129,7 +128,6 @@ caml_set_static_env
129128
caml_sys_const_naked_pointers_checked
130129

131130
From +toplevel.js:
132-
caml_get_section_table
133131
jsoo_toplevel_init_compile
134132
jsoo_toplevel_init_reloc
135133

compiler/tests-check-prim/unix-unix.output5

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ Missing
44
From unix.bc:
55
caml_alloc_dummy_function
66
caml_continuation_use
7-
caml_drop_continuation
87
caml_int_as_pointer
98
caml_reset_afl_instrumentation
109
caml_unix_accept
@@ -240,7 +239,6 @@ caml_set_static_env
240239
caml_sys_const_naked_pointers_checked
241240

242241
From +toplevel.js:
243-
caml_get_section_table
244242
jsoo_toplevel_init_compile
245243
jsoo_toplevel_init_reloc
246244

compiler/tests-compiler/rec52.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ let%expect_test "let rec" =
6161
Stdlib_Hashtbl = global_data.Stdlib__Hashtbl,
6262
letrec_function_context = [],
6363
c = [],
64-
d = runtime.caml_make_vect(5, 0),
64+
d = runtime.caml_array_make(5, 0),
6565
default$0 = 42;
6666
function a(x){return b(x);}
6767
function b(x){

compiler/tests-full/dune

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(rule
22
(targets stdlib.cma.js)
33
(enabled_if
4-
(= %{ocaml_version} "5.2.0"))
4+
(> %{ocaml_version} "5.2.0"))
55
(action
66
(run
77
%{bin:js_of_ocaml}
@@ -14,7 +14,7 @@
1414
(rule
1515
(targets stdlib.cma.output.js)
1616
(enabled_if
17-
(= %{ocaml_version} "5.2.0"))
17+
(> %{ocaml_version} "5.2.0"))
1818
(action
1919
(with-stdout-to
2020
%{targets}
@@ -23,7 +23,7 @@
2323
(rule
2424
(alias runtest)
2525
(enabled_if
26-
(= %{ocaml_version} "5.2.0"))
26+
(> %{ocaml_version} "5.2.0"))
2727
(action
2828
(diff stdlib.cma.expected.js stdlib.cma.output.js)))
2929

0 commit comments

Comments
 (0)