robur/opam-mirror
4
0
Fork 0
Code Issues 5 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Merge pull request 'update to git-kv 0.1.1 -- use val commit :)' (#31) from git-kv-011 into main

Browse source 
Reviewed-on: #31
Reviewed-by: Reynir Björnsson <reynir@reynir.dk>
This commit is contained in:
Reynir Björnsson 2024-12-03 12:26:53 +00:00
commit bbd09258d0
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mirage/config.ml
View file

@ -8,7 +8,7 @@ let mirror =
package "h2" ; package "h2" ;
package "ohex" ; package "ohex" ;
package "httpaf" ; package "httpaf" ;
package ~min:"0.0.5" "git-kv" ; package ~min:"0.1.1" "git-kv" ;
package ~min:"3.10.0" "git-paf" ; package ~min:"3.10.0" "git-paf" ;
package "opam-file-format" ; package "opam-file-format" ;
package ~min:"3.0.0" ~sublibs:[ "gz" ] "tar" ; package ~min:"3.0.0" ~sublibs:[ "gz" ] "tar" ;

14
mirage/unikernel.ml
View file

@ -697,11 +697,15 @@ module Make
Printf.sprintf "%s, %02d %s %04d %02d:%02d:%02d GMT" weekday d m' y hh mm ss Printf.sprintf "%s, %02d %s %04d %02d:%02d:%02d GMT" weekday d m' y hh mm ss
let commit_id git_kv = let commit_id git_kv =
Store.digest git_kv Mirage_kv.Key.empty >|= fun r -> match Git_kv.commit git_kv with
Result.fold r ~ok:Ohex.encode | Some `Clean hash ->
~error:(fun e -> Ohex.encode (Digestif.SHA1.to_raw_string hash)
Logs.err (fun m -> m "%a" Store.pp_error e); | Some `Dirty _ ->
exit 2) Logs.err (fun m -> m "commit is dirty");
exit 2
| None ->
Logs.err (fun m -> m "commit is none");
exit 2
let repo remote commit = let repo remote commit =
let upstream = List.hd (String.split_on_char '#' remote) in let upstream = List.hd (String.split_on_char '#' remote) in