CI: switch to version 0.18 of Jane Street packages

Author: vouillon

.github/workflows/build-wasm_of_ocaml.yml

@@ -20,17 +20,29 @@ jobs:
           - "4.14"
           - "5.0"
           - "5.1"
-          - "5.2"
           - "5.3"
         separate_compilation:
           - true
+        jane_street_tests:
+          - false
+        all_jane_street_tests:
+          - false
         include:
           - os: macos-latest
             ocaml-compiler: "5.3"
             separate_compilation: true
+            jane_street_tests: false
+            all_jane_street_tests: false
           - os: ubuntu-latest
-            ocaml-compiler: "4.14"
+            ocaml-compiler: "5.2"
+            separate_compilation: true
+            jane_street_tests: true
+            all_jane_street_tests: true
+          - os: ubuntu-latest
+            ocaml-compiler: "5.2"
             separate_compilation: false
+            jane_street_tests: true
+            all_jane_street_tests: false
 
     runs-on: ${{ matrix.os }}
 
@@ -48,10 +60,11 @@ jobs:
           path: wasm_of_ocaml
 
       - name: Checkout Jane Street opam repository
+        if: matrix.jane_street_tests
         uses: actions/checkout@v4
         with:
           repository: janestreet/opam-repository
-          ref: feaf8f831051fd5f316963b28efd728cf0b0eca1
+          ref: 41c89c7824533f6b63cc5b6d75e6ddb1441d1520
           path: janestreet/opam-repository
 
       - name: Set-up Node.js
@@ -78,10 +91,20 @@ jobs:
         run: opam pin -n --with-version `< VERSION` .
 
       - name: Checkout Jane Street packages
+        if: matrix.jane_street_tests
         run: |
-          opam install opam-format ocamlfind dune graphics cmdliner sexplib0.v0.16.0
+          opam repo add js janestreet/opam-repository
+          opam install opam-format ocamlfind dune graphics cmdliner
           opam exec -- ocaml wasm_of_ocaml/tools/ci_setup.ml
 
+      - name: Pin Jane Street packages
+        if: ${{ ! matrix.jane_street_tests }}
+        run: |
+          opam pin add -n base.v0.16.1 https://github.com/ocaml-wasm/base.git#wasm
+          opam pin add -n time_now.v0.16.1 https://github.com/ocaml-wasm/time_now.git#wasm
+          opam pin add -n ppx_inline_test.v0.16.1 https://github.com/ocaml-wasm/ppx_inline_test.git#wasm
+          opam pin add -n ppx_expect.v0.16.1 https://github.com/ocaml-wasm/ppx_expect.git#wasm
+
       - name: Install wasm_of_ocaml and its test dependencies
         working-directory: ./wasm_of_ocaml
         run: |
@@ -97,52 +120,82 @@ jobs:
         working-directory: ./wasm_of_ocaml
         run: opam exec -- dune build @runtest-wasm --profile with-effects
 
+      - name: Create node wrapper for Jane Street tests
+        run: |
+          mkdir -p ~/.local/bin
+          cat > ~/.local/bin/node <<EOF
+          #!/bin/sh
+          exec `which node` --experimental-wasm-jspi "\$@"
+          EOF
+          chmod +x ~/.local/bin/node
+          echo ~/.local/bin >> "$GITHUB_PATH"
+
       - name: Run Base tests
-        if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }}
+        if: matrix.all_jane_street_tests
         working-directory: ./janestreet/lib/base
         run: opam exec -- dune runtest
 
       - name: Run Base bigstring tests
-        if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }}
+        if: matrix.all_jane_street_tests
         working-directory: ./janestreet/lib/base_bigstring
         run: opam exec -- dune runtest
 
       - name: Run Core tests
-        if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }}
+        if: matrix.all_jane_street_tests
         working-directory: ./janestreet/lib/core
         run: opam exec -- dune runtest
 
       - name: Run Bignum tests
-        if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }}
+        if: matrix.all_jane_street_tests
         working-directory: ./janestreet/lib/bignum
         run: opam exec -- dune runtest
 
       - name: Run Bin_prot tests
-        if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }}
+        if: matrix.all_jane_street_tests
         working-directory: ./janestreet/lib/bin_prot
         run: opam exec -- dune runtest
 
       - name: Run String_dict tests
-        if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }}
+        if: matrix.all_jane_street_tests
         working-directory: ./janestreet/lib/string_dict
         run: opam exec -- dune runtest
 
       - name: Run Zarith tests
-        if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }}
+        if: matrix.all_jane_street_tests
         working-directory: ./janestreet/lib/zarith_stubs_js
         run: opam exec -- dune runtest
 
       - name: Run Virtual_dom tests
-        if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }}
+        if: matrix.all_jane_street_tests
         working-directory: ./janestreet/lib/virtual_dom
         run: opam exec -- dune runtest
 
       - name: Run Bonsai tests
-        if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }}
-        working-directory: ./janestreet/lib/bonsai
+        if: matrix.all_jane_street_tests
+        working-directory: ./janestreet/lib/bonsai_test
+        run: opam exec -- dune runtest
+
+      - name: Run Bonsai web tests
+        if: matrix.all_jane_street_tests
+        working-directory: ./janestreet/lib/bonsai_web_test
+        run: opam exec -- dune runtest
+
+      - name: Run Bonsai web components' tests
+        if: matrix.all_jane_street_tests
+        working-directory: ./janestreet/lib/bonsai_web_components
         run: opam exec -- dune runtest
 
       - name: Run Bonsai tests (release profile)
         if: ${{ ! matrix.separate_compilation }}
-        working-directory: ./janestreet/lib/bonsai
+        working-directory: ./janestreet/lib/bonsai_test
+        run: opam exec -- dune runtest --profile release
+
+      - name: Run Bonsai web tests (release profile)
+        if: ${{ ! matrix.separate_compilation }}
+        working-directory: ./janestreet/lib/bonsai_web_test
+        run: opam exec -- dune runtest --profile release
+
+      - name: Run Bonsai web components' tests (release profile)
+        if: ${{ ! matrix.separate_compilation }}
+        working-directory: ./janestreet/lib/bonsai_web_components
         run: opam exec -- dune runtest --profile release

tools/ci_setup.ml

@@ -12,27 +12,52 @@ module StringSet = Set.Make (String)
 
 let repo = "janestreet/opam-repository/packages"
 
-let roots = [ "bonsai"; "string_dict" ]
+let roots = [ "bonsai_web_components"; "string_dict"; "ppx_html" ]
 
 let omitted_others = StringSet.of_list [ "cohttp-async"; "cohttp"; "uri"; "uri-sexp" ]
 
 let omitted_js = StringSet.of_list [ "sexplib0" ]
 
-let do_not_pin =
+let do_pin =
   StringSet.of_list
-    [ "wasocaml"; "wasm_of_ocaml"; "dune"; "ezjs"; "ezjs_blockies"; "fmlib"; "graphv" ]
+    [ "base"
+    ; "ppx_expect"
+    ; "ppx_inline_test"
+    ; "time_now"
+    ; "ocaml_intrinsics_kernel"
+    ; "bigstringaf"
+    ]
 
-let do_pin = StringSet.of_list [ "base"; "ppx_expect"; "ppx_inline_test"; "time_now" ]
-
-let aliases = [ "ocaml-cstruct", "cstruct" ]
+let forked_packages =
+  StringSet.of_list
+    [ "async_js"
+    ; "base"
+    ; "base_bigstring"
+    ; "bin_prot"
+    ; "bonsai_test"
+    ; "bonsai_web"
+    ; "bonsai_web_components"
+    ; "bonsai_web_test"
+    ; "core"
+    ; "core_kernel"
+    ; "ocaml_intrinsics_kernel"
+    ; "ppx_expect"
+    ; "ppx_inline_test"
+    ; "ppx_module_timer"
+    ; "string_dict"
+    ; "time_now"
+    ; "virtual_dom"
+    ; "virtual_dom_toplayer"
+    ; "zarith_stubs_js"
+    ]
 
 let dune_workspace =
   {|(lang dune 3.17)
 (env
  (_
   (env-vars (TESTING_FRAMEWORK inline-test))
   (js_of_ocaml (enabled_if false))
-  (flags :standard -warn-error -8-32-34-49-52-55 -w -67-69)))
+  (flags :standard -warn-error -7-8-27-30-32-34-37-49-52-55 -w -67-69)))
 |}
 
 let patches =
@@ -60,19 +85,17 @@ diff --git a/dune-project b/dune-project
 index e563d7e..b87e356 100644
 --- a/dune-project
 +++ b/dune-project
-@@ -1,3 +1,3 @@
--(lang dune 2.0)
+@@ -1 +1 @@
+-(lang dune 3.11)
 +(lang dune 3.17)
- 
- (formatting disabled)
 diff --git a/test/src/dune b/test/src/dune
 index f93ae3f..3f00557 100644
 --- a/test/src/dune
 +++ b/test/src/dune
 @@ -2,5 +2,6 @@
   (name bignum_test)
   (libraries bigint bignum core expect_test_helpers_core
-    sexp_grammar_validation)
+    sexp_grammar_validation zarith)
 + (inline_tests (flags -drop-tag no-js -drop-tag no-wasm -drop-tag 64-bits-only) (modes js wasm))
   (preprocess
    (pps ppx_jane)))
@@ -91,58 +114,7 @@ index c6d09fb..61b1e5b 100644
 +
  let%expect_test "Bignum.abs" =
    let test t =
-     let t' = require_no_allocation [%here] (fun () -> abs t) in
-@@ -71,7 +76,7 @@ let%expect_test "Bignum.sexp_of_t does use Scientific Notation" =
- let compare_floats ~of_float x =
-   let x' = x |> of_float |> Bignum.to_float in
-   if not (Float.( = ) x x' || (Float.is_nan x && Float.is_nan x'))
--  then raise_s [%message "mismatch" (x : float) (x' : float)]
-+  then raise_s [%message "mismatch" (x : float) (x' : float) (x |> of_float : Bignum.t)]
- ;;
- 
- let%expect_test "roundtrip: f |> Bignum.of_float_decimal |> Bignum.to_float" =
-@@ -783,7 +788,7 @@ let%test_module _ =
-          -1073741825 -> ( 6) \001\253\255\255\255\191 |}]
-     ;;
- 
--    let%expect_test ("bin_io serialization V2 (javascript)" [@tags "js-only"]) =
-+    let%expect_test ("bin_io serialization V2 (javascript)" [@tags "js-only", "no-wasm"]) =
-       bin_io_tests (module V2);
-       [%expect
-         {|
-@@ -811,6 +816,34 @@ let%test_module _ =
-          -1073741825 -> ( 6) \001\253\255\255\255\191 |}]
-     ;;
- 
-+    let%expect_test ("bin_io serialization V2 (Wasm)" [@tags "wasm-only"]) =
-+      bin_io_tests (module V2);
-+      [%expect
-+        {|
-+                   0 -> ( 1) \000
-+                   1 -> ( 2) \001\001
-+                  -1 -> ( 3) \001\255\255
-+           100000001 -> ( 6) \001\253\001\225\245\005
-+           1000000.1 -> ( 6) \002\253\129\150\152\000
-+           100000.01 -> ( 6) \003\253\129\150\152\000
-+           10000.001 -> ( 6) \004\253\129\150\152\000
-+           1000.0001 -> ( 6) \005\253\129\150\152\000
-+           100.00001 -> ( 6) \006\253\129\150\152\000
-+           10.000001 -> ( 6) \007\253\129\150\152\000
-+           1.0000001 -> ( 6) \008\253\129\150\152\000
-+          0.10000001 -> ( 6) \009\253\129\150\152\000
-+         0.010000001 -> (11) \010\253\129\150\152\000\253\000\202\154\059
-+        0.0010000001 -> (22) \011\02010000001\04710000000000
-+      10000000000000 -> (16) \011\01410000000000000
-+     -10000000000000 -> (17) \011\015\04510000000000000
-+12345678901234567.12345678901234567 -> (55) \01151234567890123456712345678901234567\047100000000000000000
-+       1099511627775 -> (15) \011\0131099511627775
-+          1073741823 -> ( 6) \001\253\255\255\255\063
-+         -1073741824 -> ( 6) \001\253\000\000\000\192
-+          1073741824 -> (12) \011\0101073741824
-+         -1073741825 -> (13) \011\011\0451073741825 |}]
-+    ;;
-+
-     let%expect_test "bin_io de-serialization V2" =
+     let t' = require_no_allocation (fun () -> abs t) in
 |bignum}
     )
   ]
@@ -181,17 +153,6 @@ let rec traverse visited p =
         let l = dependencies opam in
         List.fold_left traverse visited l
 
-let forked_packages =
-  let ch =
-    Unix.open_process_in
-      "curl -L -H 'Accept: application/vnd.github+json' -H 'X-GitHub-Api-Version: \
-       2022-11-28' https://api.github.com/orgs/ocaml-wasm/repos 2> /dev/null | jq -r \
-       '.[] | .name'"
-  in
-  let l = Str.(split (regexp "\n")) (In_channel.input_all ch) in
-  close_in ch;
-  StringSet.of_list l
-
 let is_forked p = StringSet.mem p forked_packages
 
 let exec_async ~delay cmd =
@@ -210,18 +171,11 @@ let pin delay nm =
   exec_async
     ~delay
     (Printf.sprintf
-       "opam pin add -n %s https://github.com/ocaml-wasm/%s.git#wasm"
-       (try List.assoc nm aliases
-        with Not_found -> if List.mem_assoc nm packages then nm ^ ".v0.16.1" else nm)
+       "opam pin add -n %s https://github.com/ocaml-wasm/%s.git#wasm-v0.18"
+       nm
        nm)
 
-let pin_packages js =
-  sync_exec
-    pin
-    (StringSet.elements
-       (StringSet.union
-          (StringSet.diff (StringSet.diff forked_packages js) do_not_pin)
-          do_pin))
+let pin_packages () = sync_exec pin (StringSet.elements do_pin)
 
 let install_others others =
   let others = StringSet.elements (StringSet.diff others omitted_others) in
@@ -257,19 +211,12 @@ let () =
     List.fold_left traverse StringSet.empty roots
     |> StringSet.partition (fun p -> List.mem_assoc p packages)
   in
-  pin_packages js;
+  pin_packages ();
   install_others others;
   sync_exec (fun i () -> clone i "ocaml-uri" "https://github.com/mirage/ocaml-uri") [ () ];
   sync_exec
     (fun i nm ->
-      let branch =
-        if is_forked nm
-        then
-          if List.mem nm [ "bonsai"; "virtual_dom"; "async_js"; "zarith_stubs_js" ]
-          then Some "jsoo-6"
-          else Some "wasm"
-        else None
-      in
+      let branch = if is_forked nm then Some "wasm-v0.18" else None in
       let commit =
         if is_forked nm
         then None