Misc: promote to 5.3

ocsigen · Sep 30, 2024 · e866b15 · e866b15
1 parent 51e9f41
commit e866b15
Show file tree

Hide file tree

Showing 9 changed files with 4,371 additions and 3,749 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,6 +25,7 @@ jobs:
           - "4.13"
           - "5.0"
           - "5.1"
+          - "5.2"
         skip-test:
           - true
         skip-doc:
@@ -48,17 +49,17 @@ jobs:
             skip-test: false
             skip-doc: true
           - os: ubuntu-latest
-            ocaml-compiler: "5.2"
+            ocaml-compiler: "ocaml-variants.5.3.0~alpha1"
             skip-effects: false
             skip-test: false
             skip-doc: false
           - os: macos-latest
-            ocaml-compiler: "5.2"
+            ocaml-compiler: "ocaml-variants.5.3.0~alpha1"
             skip-effects: true
             skip-test: false
             skip-doc: true
           - os: windows-latest
-            ocaml-compiler: "5.2"
+            ocaml-compiler: "ocaml-variants.5.3.0~alpha1"
             skip-effects: false
             skip-test: false
             skip-doc: true
@@ -91,6 +92,13 @@ jobs:
       - run: opam install conf-pkg-config
         if: runner.os == 'Windows'
 
+      - run: opam pin add ppxlib --dev --no-action
+        if: ${{ matrix.ocaml-compiler == 'ocaml-variants.5.3.0~alpha1' }}
+      - run: opam pin add ppxlib_jane git+https://github.com/hhugo/ppxlib_jane.git#trunk-support-503 --no-action
+        if: ${{ matrix.ocaml-compiler == 'ocaml-variants.5.3.0~alpha1' }}
+
+      - run: opam pin add ./ --no-action
+
       - run: opam install . --best-effort
         if: ${{ matrix.skip-test }}
 

diff --git a/compiler/tests-check-prim/main.output5 b/compiler/tests-check-prim/main.output5
@@ -4,7 +4,6 @@ Missing
 From main.bc:
 caml_alloc_dummy_function
 caml_continuation_use
-caml_drop_continuation
 caml_dynlink_add_primitive
 caml_dynlink_close_lib
 caml_dynlink_get_current_libs
@@ -171,7 +170,6 @@ caml_spacetime_only_works_for_native_code
 caml_sys_const_naked_pointers_checked
 
 From +toplevel.js:
-caml_get_section_table
 caml_static_alloc
 caml_static_free
 caml_terminfo_backup

diff --git a/compiler/tests-check-prim/unix-unix.output b/compiler/tests-check-prim/unix-unix.output
@@ -136,6 +136,7 @@ Unused
 -------
 
 From +array.js:
+caml_array_create_float
 caml_check_bound
 
 From +bigarray.js:

diff --git a/compiler/tests-check-prim/unix-unix.output5 b/compiler/tests-check-prim/unix-unix.output5
@@ -4,7 +4,6 @@ Missing
 From unix.bc:
 caml_alloc_dummy_function
 caml_continuation_use
-caml_drop_continuation
 caml_dynlink_add_primitive
 caml_dynlink_close_lib
 caml_dynlink_get_current_libs
@@ -282,7 +281,6 @@ caml_spacetime_only_works_for_native_code
 caml_sys_const_naked_pointers_checked
 
 From +toplevel.js:
-caml_get_section_table
 caml_static_alloc
 caml_static_free
 caml_terminfo_backup

diff --git a/compiler/tests-check-prim/unix-win32.output b/compiler/tests-check-prim/unix-win32.output
@@ -101,6 +101,7 @@ Unused
 -------
 
 From +array.js:
+caml_array_create_float
 caml_check_bound
 
 From +bigarray.js:

diff --git a/compiler/tests-full/dune b/compiler/tests-full/dune
@@ -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}
@@ -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}
@@ -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)))