diff --git a/.gitlab/ci/templates.yml b/.gitlab/ci/templates.yml index 0bec9d5d5f2175f6bffb39916dbf739a33826105..b8ae2ecda369912adddbe975a2b8c19afc81a4e5 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: e5c4c9e8bf716902dbeb699a73053c6d6202e4b9 + build_deps_image_version: ba1ace10fe5b100b54bc51ab67e7afd1967a4e5f 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 a00a2838df52bf5864994a5cfe603b54fcd3ba24..2e9f6d7ab743d82953be25e10802609c8e338f90 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=87ee6c685f0d3e809d1c09a26038eb3b07cfebed +export full_opam_repository_tag=f0b73342dac7ff49e1746ba37b975462ad3ae91b ## 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 +## This value MUST be the same as `build_deps_image_version` in `.gitlab/ci/templates.yml export opam_repository_url=https://gitlab.com/tezos/opam-repository -export opam_repository_tag=e5c4c9e8bf716902dbeb699a73053c6d6202e4b9 +export opam_repository_tag=ba1ace10fe5b100b54bc51ab67e7afd1967a4e5f export opam_repository_git=$opam_repository_url.git export opam_repository=$opam_repository_git\#$opam_repository_tag