Fix CI

Author: OlivierNicole

tools/ci_setup.ml

@@ -297,29 +297,28 @@ let sync_exec f l =
   let l = List.map f l in
   List.iter (fun f -> f ()) l
 
-let org_branch nm =
+let branch nm =
   if is_forked nm then
-    ( "ocaml-wasm"
-    , match nm with
-      | "async_js"
-      | "base"
-      | "core"
-      | "core_kernel"
-      | "core_unix"
-      | "time_now"
-      | "zarith_stubs_js" -> Some "js-strings"
-      | _ -> Some "wasm-v0.18" )
+    match nm with
+    | "async_js"
+    | "base"
+    | "core"
+    | "core_kernel"
+    | "core_unix"
+    | "time_now"
+    | "zarith_stubs_js" -> Some "js-strings"
+    | _ -> Some "wasm-v0.18"
   else
-    "janestreet", None
+    None
 
 let pin nm =
-  let _, branch = org_branch nm in
+  let branch = Option.get (branch nm) in
   exec_async
     (Printf.sprintf
-       "opam pin add -n %s https://github.com/ocaml-wasm/%s.git%s"
+       "opam pin add -n %s https://github.com/ocaml-wasm/%s.git#%s"
        nm
        nm
-       (match branch with Some b -> "#" ^ b | None -> ""))
+       branch)
 
 let pin_packages () = sync_exec pin (StringSet.elements do_pin)
 
@@ -375,7 +374,7 @@ let () =
   sync_exec (fun () -> exec_async "opam install uri --deps-only") [ () ];
   sync_exec
     (fun nm ->
-      let org, branch = org_branch nm in
+      let branch = branch nm in
       let commit =
         if is_forked nm
         then None
@@ -392,7 +391,7 @@ let () =
         nm
         (Printf.sprintf
            "https://github.com/%s/%s"
-           org
+           (if is_forked nm then "ocaml-wasm" else "janestreet")
            nm))
     (StringSet.elements (StringSet.diff js omitted_js))