From 8c80a0a1fe8de634981b59583a90cb4e150ea774 Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Fri, 7 Oct 2022 12:02:08 +0200 Subject: [PATCH 1/3] Context: use irmin.3.4.2 api --- src/lib_context/disk/context.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_context/disk/context.ml b/src/lib_context/disk/context.ml index ce1e7c196eb7..63b1620412c9 100644 --- a/src/lib_context/disk/context.ml +++ b/src/lib_context/disk/context.ml @@ -942,7 +942,8 @@ module Make (Encoding : module type of Tezos_context_encoding.Context) = struct (* All commit objects in the context are indexed, so it's safe to build a hash-only key referencing them. *) List.map - (fun h -> Hash.of_context_hash h |> Irmin_pack.Pack_key.v_indexed) + (fun h -> + Hash.of_context_hash h |> Irmin_pack_unix.Pack_key.v_indexed) parents in let+ c = Store.Commit.v ctxt.index.repo ~info ~parents ctxt.tree in -- GitLab From d2dbc42c07865053e5559766a6fd0646e370cad5 Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Fri, 7 Oct 2022 14:40:37 +0200 Subject: [PATCH 2/3] Storage: cancel GC while calling Context.close --- src/lib_context/disk/context.ml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib_context/disk/context.ml b/src/lib_context/disk/context.ml index 63b1620412c9..223fc413b267 100644 --- a/src/lib_context/disk/context.ml +++ b/src/lib_context/disk/context.ml @@ -783,7 +783,9 @@ module Make (Encoding : module type of Tezos_context_encoding.Context) = struct in {path = root; repo; patch_context; readonly} - let close index = Store.Repo.close index.repo + let close index = + let _interrupted_gc = Store.Gc.cancel index.repo in + Store.Repo.close index.repo let get_branch chain_id = Format.asprintf "%a" Chain_id.pp chain_id -- GitLab From 479838198e059ccd3f36c16412c1222bc2986011 Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Wed, 12 Oct 2022 09:31:00 +0200 Subject: [PATCH 3/3] Build: update opam deps --- .gitlab/ci/templates.yml | 2 +- scripts/version.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab/ci/templates.yml b/.gitlab/ci/templates.yml index 1e14b3fdbe53..05f723ff71a8 100644 --- a/.gitlab/ci/templates.yml +++ b/.gitlab/ci/templates.yml @@ -2,7 +2,7 @@ variables: # /!\ CI_REGISTRY is overriden to use a private Docker registry mirror in AWS ECR # in GitLab namespaces `nomadic-labs` and `tezos` ## This value MUST be the same as `opam_repository_tag` in `scripts/version.sh` - build_deps_image_version: df8d0aa9d9a08a49cf97f27e58662c10fb3f70f2 + build_deps_image_version: d97ef23a0dadf1a8133e76d3e4cc175dfc9ee8ec build_deps_image_name: "${CI_REGISTRY}/tezos/opam-repository" GIT_STRATEGY: fetch GIT_DEPTH: "1" diff --git a/scripts/version.sh b/scripts/version.sh index 57350db7585a..99bc927d5443 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -20,12 +20,12 @@ export recommended_node_version=14.12.0 ## full_opam_repository is a commit hash of the public OPAM repository, i.e. ## https://github.com/ocaml/opam-repository -export full_opam_repository_tag=5b15e5ee8adbd7522032018e1694f547555ba2b6 +export full_opam_repository_tag=efe0e53484b1a5a3bde1d762dca7277d0f326ba2 ## opam_repository is an additional, tezos-specific opam repository. ## This value MUST be the same as `build_deps_image_version` in `.gitlab/ci/templates.ym export opam_repository_url=https://gitlab.com/tezos/opam-repository -export opam_repository_tag=df8d0aa9d9a08a49cf97f27e58662c10fb3f70f2 +export opam_repository_tag=d97ef23a0dadf1a8133e76d3e4cc175dfc9ee8ec export opam_repository_git=$opam_repository_url.git export opam_repository=$opam_repository_git\#$opam_repository_tag -- GitLab