From c51fbeb732aba57db0b95135253eb063b7fb9715 Mon Sep 17 00:00:00 2001
From: Romain Bardou <romain@nomadic-labs.com>
Date: Wed, 24 Aug 2022 14:07:47 +0200
Subject: [PATCH] Build: use json-data-encoding 0.12

---
 .gitlab/ci/templates.yml | 2 +-
 manifest/main.ml         | 2 +-
 opam/tezos-openapi.opam  | 2 +-
 scripts/version.sh       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab/ci/templates.yml b/.gitlab/ci/templates.yml
index bc7740d7c215..1d8a30dbf2a9 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: d19f422fc819da8d82d2214e1105ca3867f0e1eb
+  build_deps_image_version: a999d04a567ffcb1d9f018ed12f1cca91948663c
   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 1d6dadfff37d..b60782a2c5fa 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -187,7 +187,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 f56005072e34..68689509d81d 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 c34cac8a677b..d3fd7ab73d0a 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=187686a4f13743104fb272962979e96cdbf6e5a7
+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=d19f422fc819da8d82d2214e1105ca3867f0e1eb
+export opam_repository_tag=a999d04a567ffcb1d9f018ed12f1cca91948663c
 export opam_repository_git=$opam_repository_url.git
 export opam_repository=$opam_repository_git\#$opam_repository_tag
 
-- 
GitLab