diff --git a/.gitlab/ci/templates.yml b/.gitlab/ci/templates.yml index bd1adc0e1bec3ea4a6191842c05974c15acfd799..69cdf2e2600583995b47044380fcad2716bd030c 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: b89e606dfe9bafa902dee842e60e3c1634ee139b + build_deps_image_version: d75ab9ed7be3e5c95caf3a35bca473721440b51c build_deps_image_name: "${CI_REGISTRY}/tezos/opam-repository" GIT_STRATEGY: fetch GIT_DEPTH: "1" diff --git a/manifest/main.ml b/manifest/main.ml index ad4631f3bbabf31809b3f76de9d63afba8671771..4cafc00c47e937ffa366764a2125daa34bf588a7 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -188,7 +188,7 @@ let json_data_encoding = external_lib ~js_compatible:true "json-data-encoding" - V.(at_least "0.11" && less_than "0.12") + V.(at_least "0.11" && less_than "0.13") let logs = external_lib "logs" V.True diff --git a/opam/tezos-openapi.opam b/opam/tezos-openapi.opam index f56005072e343be0808705a3b03ce2629d2a17f6..68689509d81d5de7a98bdd74a8743f69dd1414c7 100644 --- a/opam/tezos-openapi.opam +++ b/opam/tezos-openapi.opam @@ -10,7 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ezjsonm" { >= "1.1.0" } - "json-data-encoding" { >= "0.11" & < "0.12" } + "json-data-encoding" { >= "0.11" & < "0.13" } "tezt" ] build: [ diff --git a/scripts/version.sh b/scripts/version.sh index 7c04f8e3331e701313b578cf887e72f6a933286e..1f4f1ae5c048717669449a61bf5e4ba316c787a1 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=72b98f28026d3e7790c6df51fd2653968798fc9a +export full_opam_repository_tag=231273e96a862099add322413688f896afb02464 ## 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=b89e606dfe9bafa902dee842e60e3c1634ee139b +export opam_repository_tag=d75ab9ed7be3e5c95caf3a35bca473721440b51c export opam_repository_git=$opam_repository_url.git export opam_repository=$opam_repository_git\#$opam_repository_tag