Skip to content

Copy the opam to lint in a directory to have a reliable opam show c… #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samoht merged 1 commit into from
Sep 10, 2018
Merged

Copy the opam to lint in a directory to have a reliable opam show c… #245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/ci_opam.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,15 @@ let lint_pins pkg pins =
let pkgs = Strings.add pkg (Some ".") pkgs in
Strings.fold (fun k v acc -> (k, v) :: acc) pkgs []

let (/) = Filename.concat

let temp_dir () =
let dir =
Filename.get_temp_dir_name () / "opam-ci-" ^ string_of_int (Random.int 256)
in
?|~ "rm -rf %s && mkdir -p %s" dir dir;
dir

;; (* Go go go *)

with_fold "Prepare" (fun () ->
Expand All @@ -243,8 +252,6 @@ with_fold "Prepare" (fun () ->
end;
List.iter add_remote extra_remotes;

let (/) = Filename.concat in

let opam =
if Sys.file_exists (pkg_name ^ ".opam") then (pkg_name ^ ".opam")
else if Sys.file_exists "opam"
Expand All @@ -257,7 +264,11 @@ with_fold "Prepare" (fun () ->
in

(if opam_lint then match opam_version with
| `V2 -> ?|~ "opam lint %s --warn=-21-32-48" opam
| `V2 ->
(* note: 'opam show ./file --raw' will not do the 1.2->2.0
translation in opam2 pre-release *)
let tmp_dir = temp_dir () in
?|~ "cp %s %s && opam show %s --raw | opam lint -" opam tmp_dir tmp_dir
| _ -> ?|~ "opam lint %s" opam);
let pins = lint_pins pkg pins in
List.iter pin pins;
Expand Down