From bac636f2db72b09e6100ab219a66b7a3707825b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Kr=C3=BCger?= Date: Fri, 14 Oct 2022 14:25:06 +0100 Subject: [PATCH] Build: Update the full opam-repository --- .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 05f723ff71a8..ee16b5f3c2de 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: d97ef23a0dadf1a8133e76d3e4cc175dfc9ee8ec + build_deps_image_version: 05199a11ba5c3eef247c4b7bbf69b19c7d78a600 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 99bc927d5443..4eface506f5c 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=efe0e53484b1a5a3bde1d762dca7277d0f326ba2 +export full_opam_repository_tag=87ee6c685f0d3e809d1c09a26038eb3b07cfebed ## 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=d97ef23a0dadf1a8133e76d3e4cc175dfc9ee8ec +export opam_repository_tag=05199a11ba5c3eef247c4b7bbf69b19c7d78a600 export opam_repository_git=$opam_repository_url.git export opam_repository=$opam_repository_git\#$opam_repository_tag -- GitLab