Skip to content

Commit d00d135

Browse files
committed
Misc: promote to 5.3
1 parent 9315996 commit d00d135

File tree

9 files changed

+4465
-3849
lines changed

9 files changed

+4465
-3849
lines changed

.github/workflows/build.yml

Lines changed: 11 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-variants.5.3.0~alpha1"
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-variants.5.3.0~alpha1"
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-variants.5.3.0~alpha1"
7374
skip-effects: false
7475
skip-test: false
7576
skip-doc: true
@@ -115,6 +116,13 @@ jobs:
115116
- run: opam install conf-pkg-config
116117
if: runner.os == 'Windows'
117118

119+
- run: opam pin add ppxlib --dev --no-action
120+
if: ${{ matrix.ocaml-compiler == 'ocaml-variants.5.3.0~alpha1' }}
121+
- run: opam pin add ppxlib_jane git+https://github.com/hhugo/ppxlib_jane.git#trunk-support-503 --no-action
122+
if: ${{ matrix.ocaml-compiler == 'ocaml-variants.5.3.0~alpha1' }}
123+
124+
- run: opam pin add ./ --no-action
125+
118126
- run: opam install . --best-effort
119127
if: ${{ matrix.skip-test }}
120128

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_dynlink_add_primitive
98
caml_dynlink_close_lib
109
caml_dynlink_get_current_libs
@@ -172,7 +171,6 @@ caml_spacetime_only_works_for_native_code
172171
caml_sys_const_naked_pointers_checked
173172

174173
From +toplevel.js:
175-
caml_get_section_table
176174
caml_static_alloc
177175
caml_static_free
178176
caml_terminfo_backup

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ Unused
136136
-------
137137

138138
From +array.js:
139+
caml_array_create_float
139140
caml_check_bound
140141

141142
From +bigarray.js:

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_dynlink_add_primitive
98
caml_dynlink_close_lib
109
caml_dynlink_get_current_libs
@@ -283,7 +282,6 @@ caml_spacetime_only_works_for_native_code
283282
caml_sys_const_naked_pointers_checked
284283

285284
From +toplevel.js:
286-
caml_get_section_table
287285
caml_static_alloc
288286
caml_static_free
289287
caml_terminfo_backup

compiler/tests-check-prim/unix-win32.output

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ Unused
101101
-------
102102

103103
From +array.js:
104+
caml_array_create_float
104105
caml_check_bound
105106

106107
From +bigarray.js:

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)