2024-10-09 16:42.02: New job: test ocaml/odoc https://github.com/ocaml/odoc.git#refs/pull/1208/head (8808d09fab747ae7e9e30ad7d1171b1a7a03c532) (linux-x86_64:(lint-fmt)) Base: ocaml/opam:debian-12-ocaml-4.08@sha256:313659e036d93aad64e3d503c7a2aa6326e0a2c7426087b094ccca6aed7d1612 ocamlformat version: version 0.26.1 (from opam) To reproduce locally: git clone --recursive "https://github.com/ocaml/odoc.git" && cd "odoc" && git fetch origin "refs/pull/1208/head" && git reset --hard 8808d09f cat > Dockerfile <<'END-OF-DOCKERFILE' FROM ocaml/opam:debian-12-ocaml-4.08@sha256:313659e036d93aad64e3d503c7a2aa6326e0a2c7426087b094ccca6aed7d1612 USER 1000:1000 RUN cd ~/opam-repository && (git cat-file -e 525e9f91783f83939e57ae00eb12498294707461 || git fetch origin master) && git reset -q --hard 525e9f91783f83939e57ae00eb12498294707461 && git log --no-decorate -n1 --oneline && opam update -u RUN opam depext -i dune WORKDIR /src RUN opam depext -i ocamlformat=0.26.1 COPY --chown=1000:1000 . /src/ RUN opam exec -- dune build @fmt --ignore-promoted-rules || (echo "dune build @fmt failed"; exit 2) END-OF-DOCKERFILE docker build . END-REPRO-BLOCK 2024-10-09 16:42.02: Using cache hint "ocaml/odoc-ocaml/opam:debian-12-ocaml-4.08@sha256:313659e036d93aad64e3d503c7a2aa6326e0a2c7426087b094ccca6aed7d1612-debian-12-4.08_opam-2.2-ocamlformat-525e9f91783f83939e57ae00eb12498294707461" 2024-10-09 16:42.02: Using OBuilder spec: ((from ocaml/opam:debian-12-ocaml-4.08@sha256:313659e036d93aad64e3d503c7a2aa6326e0a2c7426087b094ccca6aed7d1612) (user (uid 1000) (gid 1000)) (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "cd ~/opam-repository && (git cat-file -e 525e9f91783f83939e57ae00eb12498294707461 || git fetch origin master) && git reset -q --hard 525e9f91783f83939e57ae00eb12498294707461 && git log --no-decorate -n1 --oneline && opam update -u")) (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i dune")) (workdir /src) (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i ocamlformat=0.26.1")) (copy (src .) (dst /src/)) (run (shell "opam exec -- dune build @fmt --ignore-promoted-rules || (echo \"dune build @fmt failed\"; exit 2)")) ) 2024-10-09 16:42.02: Waiting for resource in pool OCluster 2024-10-09 16:42.03: Waiting for worker… 2024-10-09 16:44.29: Got resource from pool OCluster Building on asteria.caelum.ci.dev All commits already cached HEAD is now at 8808d09f Fixes following review (from ocaml/opam:debian-12-ocaml-4.08@sha256:313659e036d93aad64e3d503c7a2aa6326e0a2c7426087b094ccca6aed7d1612) 2024-10-09 16:44.58 ---> saved as "8ac68bced7188653db7b81863dbdd05e2bdaccde05c724cc4b90798d2e42b237" /: (user (uid 1000) (gid 1000)) /: (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "cd ~/opam-repository && (git cat-file -e 525e9f91783f83939e57ae00eb12498294707461 || git fetch origin master) && git reset -q --hard 525e9f91783f83939e57ae00eb12498294707461 && git log --no-decorate -n1 --oneline && opam update -u")) From https://github.com/ocaml/opam-repository * branch master -> FETCH_HEAD 75006f8c5e..56a44a6040 master -> origin/master 525e9f9178 Merge pull request #26639 from mtelvers/opam-publish-ocaml-version.3.6.9 <><> Updating package repositories ><><><><><><><><><><><><><><><><><><><><><><> [default] synchronised from file:///home/opam/opam-repository default (at file:///home/opam/opam-repository): [INFO] opam 2.1 and 2.2 include many performance and security improvements over 2.0; please consider upgrading (https://opam.ocaml.org/doc/Install.html) Everything as up-to-date as possible (run with --verbose to show unavailable upgrades). However, you may "opam upgrade" these packages explicitly, which will ask permission to downgrade or uninstall the conflicting packages. Nothing to do. # Run eval $(opam env) to update the current shell environment 2024-10-09 16:46.04 ---> saved as "a21bd7513dcf5833d662789450c6f33572a4c1a9f3b46154afd115a32f751142" /: (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i dune")) # Detecting depexts using vars: arch=x86_64, os=linux, os-distribution=debian, os-family=debian # No extra OS packages requirements found. # All required OS packages found. # Now letting opam install the packages The following actions will be performed: - install dune 3.16.0 <><> Gathering sources ><><><><><><><><><><><><><><><><><><><><><><><><><><><><> [dune.3.16.0] found in cache <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> -> installed dune.3.16.0 Done. # Run eval $(opam env) to update the current shell environment 2024-10-09 16:46.37 ---> saved as "1c0aa1ffcd30b30e93efe5f8f110da1163e6dbc8e3b92fd8a8595449e53f7d11" /: (workdir /src) /src: (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i ocamlformat=0.26.1")) # Detecting depexts using vars: arch=x86_64, os=linux, os-distribution=debian, os-family=debian # No extra OS packages requirements found. # All required OS packages found. # Now letting opam install the packages The following actions will be performed: - install sexplib0 v0.14.0 [required by base] - install ocaml-version 3.6.9 [required by ocamlformat-lib] - install menhirLib 20240715 [required by ocamlformat-lib] - install menhirCST 20240715 [required by menhir] - install menhirSdk 20240715 [required by ocamlformat-lib] - install ocamlbuild 0.15.0 [required by fpath, astring, uuseg] - install either 1.0.0 [required by ocamlformat-lib] - install ocamlfind 1.9.6 [required by ocp-indent, astring, fpath, uuseg] - install cmdliner 1.3.0 [required by ocamlformat] - install result 1.5 [required by ocamlformat-lib] - install seq base [required by re] - install csexp 1.5.2 [required by ocamlformat-lib] - install camlp-streams 5.0.1 [required by ocamlformat-lib] - install dune-build-info 3.16.0 [required by ocamlformat-lib] - install fix 20230505 [required by ocamlformat-lib] - install menhir 20240715 [required by ocamlformat-lib] - install topkg 1.0.7 [required by fpath, astring, uuseg] - install base-bytes base [required by ocp-indent] - install re 1.11.0 [required by ocamlformat] - install dune-configurator 3.16.0 [required by base] - install uutf 1.0.3 [required by ocamlformat-lib] - install astring 0.8.5 [required by ocamlformat-lib] - install ocp-indent 1.8.1 [required by ocamlformat-lib] - install base v0.14.3 [required by ocamlformat-lib] - install uucp 15.0.0 [required by uuseg] - install fpath 0.7.3 [required by ocamlformat-lib] - install stdio v0.14.0 [required by ocamlformat-lib] - install uuseg 15.0.0 [required by ocamlformat-lib] - install ocamlformat-lib 0.26.1 [required by ocamlformat] - install ocamlformat 0.26.1 ===== 30 to install ===== <><> Gathering sources ><><><><><><><><><><><><><><><><><><><><><><><><><><><><> [astring.0.8.5] found in cache [base.v0.14.3] found in cache [camlp-streams.5.0.1] found in cache [cmdliner.1.3.0] found in cache [csexp.1.5.2] found in cache [dune-build-info.3.16.0] found in cache [dune-configurator.3.16.0] found in cache [either.1.0.0] found in cache [fix.20230505] found in cache [fpath.0.7.3] found in cache [menhir.20240715] found in cache [menhirCST.20240715] found in cache [menhirLib.20240715] found in cache [menhirSdk.20240715] found in cache [ocaml-version.3.6.9] found in cache [ocamlbuild.0.15.0] found in cache [ocamlfind.1.9.6] found in cache [ocamlformat.0.26.1] found in cache [ocamlformat-lib.0.26.1] found in cache [ocp-indent.1.8.1] found in cache [re.1.11.0] found in cache [result.1.5] found in cache [sexplib0.v0.14.0] found in cache [stdio.v0.14.0] found in cache [topkg.1.0.7] found in cache [uucp.15.0.0] found in cache [uuseg.15.0.0] found in cache [uutf.1.0.3] found in cache <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> -> installed seq.base -> installed camlp-streams.5.0.1 -> installed cmdliner.1.3.0 -> installed csexp.1.5.2 -> installed either.1.0.0 -> installed fix.20230505 -> installed menhirCST.20240715 -> installed menhirLib.20240715 -> installed menhirSdk.20240715 -> installed ocaml-version.3.6.9 -> installed result.1.5 -> installed sexplib0.v0.14.0 -> installed re.1.11.0 -> installed dune-build-info.3.16.0 -> installed ocamlbuild.0.15.0 -> installed dune-configurator.3.16.0 -> installed ocamlfind.1.9.6 -> installed base-bytes.base -> installed ocp-indent.1.8.1 -> installed topkg.1.0.7 -> installed base.v0.14.3 -> installed astring.0.8.5 -> installed uutf.1.0.3 -> installed stdio.v0.14.0 -> installed fpath.0.7.3 -> installed menhir.20240715 -> installed uucp.15.0.0 -> installed uuseg.15.0.0 -> installed ocamlformat-lib.0.26.1 -> installed ocamlformat.0.26.1 Done. <><> ocp-indent.1.8.1 installed successfully ><><><><><><><><><><><><><><><><><> => This package requires additional configuration for use in editors. Install package 'user-setup', or manually: * for Emacs, add these lines to ~/.emacs: (add-to-list 'load-path "/home/opam/.opam/4.08/share/emacs/site-lisp") (require 'ocp-indent) * for Vim, add this line to ~/.vimrc: set rtp^="/home/opam/.opam/4.08/share/ocp-indent/vim" # Run eval $(opam env) to update the current shell environment 2024-10-09 16:47.47 ---> saved as "5bd8615c295ff37f8763c6c84f9a80352c6febc443c7fd6802a1a8b839fc7b1d" /src: (copy (src .) (dst /src/)) 2024-10-09 16:47.47 ---> saved as "23dbb37d3e1be94b6fcdfcba40d6bbc2b5972f83fa31945f9217aa0a313291f4" /src: (run (shell "opam exec -- dune build @fmt --ignore-promoted-rules || (echo \"dune build @fmt failed\"; exit 2)")) File "src/driver/library_names.mli", line 1, characters 0-0: diff --git a/_build/default/src/driver/library_names.mli b/_build/default/src/driver/.formatted/library_names.mli index 3a81673..44048b3 100644 --- a/_build/default/src/driver/library_names.mli +++ b/_build/default/src/driver/.formatted/library_names.mli @@ -5,10 +5,7 @@ type library = { deps : string list; } -type t = { - meta_dir : Fpath.t; - libraries : library list; -} +type t = { meta_dir : Fpath.t; libraries : library list } val process_meta_file : Fpath.t -> t (** From a path to a [Meta] file, returns the list of libraries defined in this File "src/driver/library_names.ml", line 1, characters 0-0: diff --git a/_build/default/src/driver/library_names.ml b/_build/default/src/driver/.formatted/library_names.ml index 166a592..4b18769 100644 --- a/_build/default/src/driver/library_names.ml +++ b/_build/default/src/driver/.formatted/library_names.ml @@ -17,10 +17,7 @@ type library = { deps : string list; } -type t = { - meta_dir : Fpath.t; - libraries : library list; -} +type t = { meta_dir : Fpath.t; libraries : library list } let read_libraries_from_pkg_defs ~library_name pkg_defs = try @@ -85,29 +82,28 @@ let process_meta_file file = { meta_dir; libraries } let libname_of_archive v = - let {meta_dir; libraries} = v in + let { meta_dir; libraries } = v in List.fold_left - (fun acc (x : library) -> - match x.archive_name with - | None -> acc - | Some archive_name -> - let dir = - match x.dir with - | None -> meta_dir - | Some x -> Fpath.(meta_dir // v x) - in - Fpath.Map.update - Fpath.(dir / archive_name) - (function - | None -> Some x.name - | Some y -> - Logs.err (fun m -> - m "Multiple libraries for archive %s: %s and %s." - archive_name x.name y); - Some y) - acc) - Fpath.Map.empty libraries - + (fun acc (x : library) -> + match x.archive_name with + | None -> acc + | Some archive_name -> + let dir = + match x.dir with + | None -> meta_dir + | Some x -> Fpath.(meta_dir // v x) + in + Fpath.Map.update + Fpath.(dir / archive_name) + (function + | None -> Some x.name + | Some y -> + Logs.err (fun m -> + m "Multiple libraries for archive %s: %s and %s." + archive_name x.name y); + Some y) + acc) + Fpath.Map.empty libraries let directories v = let { meta_dir; libraries } = v in File "src/driver/run.ml", line 1, characters 0-0: diff --git a/_build/default/src/driver/run.ml b/_build/default/src/driver/.formatted/run.ml index c7261fb..680b933 100644 --- a/_build/default/src/driver/run.ml +++ b/_build/default/src/driver/.formatted/run.ml @@ -42,7 +42,7 @@ let run env cmd output_file = |> Array.of_list in (* Logs.debug (fun m -> m "Running cmd %a" Fmt.(list ~sep:sp string) cmd); *) - let (r, errors) = + let r, errors = Eio.Switch.run ~name:"Process.parse_out" @@ fun sw -> let r, w = Eio.Process.pipe proc_mgr ~sw in let re, we = Eio.Process.pipe proc_mgr ~sw in File "src/driver/voodoo.ml", line 1, characters 0-0: diff --git a/_build/default/src/driver/voodoo.ml b/_build/default/src/driver/.formatted/voodoo.ml index f5cb8cf..15b5926 100644 --- a/_build/default/src/driver/voodoo.ml +++ b/_build/default/src/driver/.formatted/voodoo.ml @@ -50,9 +50,7 @@ let libname_of_archives_of_dir dir = let base = Fpath.basename file in if Astring.String.is_suffix ~affix:".cma" base then let libname = String.sub base 0 (String.length base - 4) in - Fpath.Map.add - Fpath.(dir / libname) - libname acc + Fpath.Map.add Fpath.(dir / libname) libname acc else acc) Fpath.Map.empty files @@ -65,45 +63,44 @@ let metas_of_pkg pkg = (* Given a [pkg] and an output [pkg_path], returns a pair of lists of assets an mlds *) let assets_and_mlds_of_pkg pkg_path pkg = - pkg.files |> - List.filter_map - (fun p -> - let prefix = Fpath.(v "doc" / pkg.name / "odoc-pages") in - let asset_prefix = Fpath.(v "doc" / pkg.name / "odoc-assets") in - let check_name pkg_name = - if pkg_name <> pkg.name then ( - Logs.err (fun k -> - k - "Error: name in 'doc' dir does not match package name: %s <> \ - %s" - pkg_name pkg.name); - None) - else Some () - in - let ( >>= ) = Option.bind in - match Fpath.segs p with - | "doc" :: pkg_name :: "odoc-pages" :: _ :: _ -> ( - check_name pkg_name >>= fun () -> - match Fpath.rem_prefix prefix p with - | None -> None - | Some rel_path -> - let path = Fpath.(pkg_path // p) in - if Fpath.has_ext "mld" p then - Some - (`M { Packages.mld_path = path; mld_rel_path = rel_path }) - else - Some - (`A - { Packages.asset_path = path; asset_rel_path = rel_path }) - ) - | "doc" :: pkg_name :: "odoc-assets" :: _ :: _ -> ( - check_name pkg_name >>= fun () -> - match Fpath.rem_prefix asset_prefix p with - | None -> None - | Some asset_rel_path -> - let asset_path = Fpath.(pkg_path // p) in - Some (`A { Packages.asset_path; asset_rel_path })) - | _ -> None) + pkg.files + |> List.filter_map (fun p -> + let prefix = Fpath.(v "doc" / pkg.name / "odoc-pages") in + let asset_prefix = Fpath.(v "doc" / pkg.name / "odoc-assets") in + let check_name pkg_name = + if pkg_name <> pkg.name then ( + Logs.err (fun k -> + k + "Error: name in 'doc' dir does not match package name: %s \ + <> %s" + pkg_name pkg.name); + None) + else Some () + in + let ( >>= ) = Option.bind in + match Fpath.segs p with + | "doc" :: pkg_name :: "odoc-pages" :: _ :: _ -> ( + check_name pkg_name >>= fun () -> + match Fpath.rem_prefix prefix p with + | None -> None + | Some rel_path -> + let path = Fpath.(pkg_path // p) in + if Fpath.has_ext "mld" p then + Some + (`M { Packages.mld_path = path; mld_rel_path = rel_path }) + else + Some + (`A + { Packages.asset_path = path; asset_rel_path = rel_path }) + ) + | "doc" :: pkg_name :: "odoc-assets" :: _ :: _ -> ( + check_name pkg_name >>= fun () -> + match Fpath.rem_prefix asset_prefix p with + | None -> None + | Some asset_rel_path -> + let asset_path = Fpath.(pkg_path // p) in + Some (`A { Packages.asset_path; asset_rel_path })) + | _ -> None) |> List.partition_map (function | `A asset -> Either.Left asset | `M mld -> Either.Right mld) @@ -140,25 +137,24 @@ let process_package pkg = in let meta_libraries : Packages.libty list = - metas |> - List.filter_map - (fun meta_file -> - let full_meta_path = Fpath.(pkg_path // meta_file) in - let m = Library_names.process_meta_file full_meta_path in - let libname_of_archive = Library_names.libname_of_archive m in - Fpath.Map.iter - (fun k v -> Logs.debug (fun m -> m "%a,%s\n%!" Fpath.pp k v)) - libname_of_archive; + metas + |> List.filter_map (fun meta_file -> + let full_meta_path = Fpath.(pkg_path // meta_file) in + let m = Library_names.process_meta_file full_meta_path in + let libname_of_archive = Library_names.libname_of_archive m in + Fpath.Map.iter + (fun k v -> Logs.debug (fun m -> m "%a,%s\n%!" Fpath.pp k v)) + libname_of_archive; - let directories = Library_names.directories m in - Some - (List.concat_map - (fun directory -> - Logs.debug (fun m -> - m "Processing directory: %a\n%!" Fpath.pp directory); - Packages.Lib.v ~libname_of_archive ~pkg_name:pkg.name - ~dir:directory ~cmtidir:None ~all_lib_deps ~cmi_only_libs:[]) - Fpath.(Set.to_list directories))) + let directories = Library_names.directories m in + Some + (List.concat_map + (fun directory -> + Logs.debug (fun m -> + m "Processing directory: %a\n%!" Fpath.pp directory); + Packages.Lib.v ~libname_of_archive ~pkg_name:pkg.name + ~dir:directory ~cmtidir:None ~all_lib_deps ~cmi_only_libs:[]) + Fpath.(Set.to_list directories))) |> List.flatten in @@ -174,8 +170,8 @@ let process_package pkg = (List.exists (fun lib -> Fpath.equal - Fpath.(to_dir_path lib.Packages.dir) - Fpath.(to_dir_path (pkg_path // p))) + Fpath.(to_dir_path lib.Packages.dir) + Fpath.(to_dir_path (pkg_path // p))) meta_libraries) | _ -> false) pkg.files @@ -193,13 +189,16 @@ let process_package pkg = List.map (fun libdir -> - let libname_of_archive = libname_of_archives_of_dir Fpath.(pkg_path // libdir) in + let libname_of_archive = + libname_of_archives_of_dir Fpath.(pkg_path // libdir) + in Logs.debug (fun m -> m "Processing directory without META: %a" Fpath.pp libdir); Packages.Lib.v ~libname_of_archive ~pkg_name:pkg.name ~dir:Fpath.(pkg_path // libdir) ~cmtidir:None ~all_lib_deps ~cmi_only_libs:[]) - libdirs_without_meta |> List.flatten + libdirs_without_meta + |> List.flatten in let libraries = meta_libraries @ non_meta_libraries in let result = dune build @fmt failed "/usr/bin/env" "bash" "-c" "opam exec -- dune build @fmt --ignore-promoted-rules || (echo "dune build @fmt failed"; exit 2)" failed with exit status 2 2024-10-09 16:47.50: Job failed: Failed: Build failed