From ba34de2ebe77c6aac61deadbbe109b1b53bcd1b7 Mon Sep 17 00:00:00 2001 From: metanivek Date: Thu, 5 Jan 2023 13:59:09 -0500 Subject: [PATCH 1/3] irmin-pack: close repo after integrity check --- src/irmin-pack/unix/checks.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/irmin-pack/unix/checks.ml b/src/irmin-pack/unix/checks.ml index 8ca033c3107..e3fb630fd60 100644 --- a/src/irmin-pack/unix/checks.ml +++ b/src/irmin-pack/unix/checks.ml @@ -200,9 +200,10 @@ module Make (Store : Store) = struct | Error (`Msg m) -> Fmt.kstr Lwt.fail_with "Invalid hash %S" m) heads in - let+ result = + let* result = Store.integrity_check ~ppf:Format.err_formatter ~auto_repair ~heads repo in + let+ () = Store.Repo.close repo in handle_result ?name:None result let heads = From c877d70aaea726d5f75812f22be6cf72a0cf7887 Mon Sep 17 00:00:00 2001 From: metanivek Date: Tue, 10 Jan 2023 12:26:29 -0500 Subject: [PATCH 2/3] irmin-{cli,graphql,http}: disable tests on macos --- irmin-cli.opam | 2 +- irmin-graphql.opam | 2 +- irmin-http.opam | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/irmin-cli.opam b/irmin-cli.opam index e6101594287..c72f14541a3 100644 --- a/irmin-cli.opam +++ b/irmin-cli.opam @@ -10,7 +10,7 @@ doc: "https://mirage.github.io/irmin/" build: [ ["dune" "subst"] {dev} ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & os != "macos"} ] available: arch != "arm32" & arch != "x86_32" diff --git a/irmin-graphql.opam b/irmin-graphql.opam index 08abc2b2b3c..7d6e9e1c482 100644 --- a/irmin-graphql.opam +++ b/irmin-graphql.opam @@ -10,7 +10,7 @@ doc: "https://mirage.github.io/irmin/" build: [ ["dune" "subst"] {dev} ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & os != "macos"} ] depends: [ diff --git a/irmin-http.opam b/irmin-http.opam index a8557f719c5..a04b8a931e5 100644 --- a/irmin-http.opam +++ b/irmin-http.opam @@ -10,7 +10,7 @@ doc: "https://mirage.github.io/irmin/" build: [ ["dune" "subst"] {dev} ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test & os != "macos"} ] depends: [ From 63ad5c753db11fb2c06b0e13406d385f3052a420 Mon Sep 17 00:00:00 2001 From: metanivek Date: Tue, 10 Jan 2023 14:20:02 -0500 Subject: [PATCH 3/3] Update CHANGES for 3.5.1 --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index cec738c906b..99376026901 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,8 @@ - Improve GC reachability traversal to optimize memory, speed and remove the need for temporary files. (#2085, @art-w) +## 3.5.1 + ### Fixed - **irmin-pack**