From 5ce2529ddff86e2ebaca2273f6e2db7f22fcacb1 Mon Sep 17 00:00:00 2001 From: Victor Dumitrescu Date: Wed, 27 Jul 2022 14:52:50 +0200 Subject: [PATCH 1/3] opam: bump 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 709c197fed6d..bc7740d7c215 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: b2bd9e9176c256069b00a697c75eda9c43d388b5 + build_deps_image_version: d19f422fc819da8d82d2214e1105ca3867f0e1eb 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 e4706720c3d6..c34cac8a677b 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=476a0ed6d0ab487b5fcad2be574803a617dc9745 +export full_opam_repository_tag=187686a4f13743104fb272962979e96cdbf6e5a7 ## 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=b2bd9e9176c256069b00a697c75eda9c43d388b5 +export opam_repository_tag=d19f422fc819da8d82d2214e1105ca3867f0e1eb export opam_repository_git=$opam_repository_url.git export opam_repository=$opam_repository_git\#$opam_repository_tag -- GitLab From 1b44bfd9ba62a19cb55c9958dd899c62395dd715 Mon Sep 17 00:00:00 2001 From: Victor Dumitrescu Date: Wed, 27 Jul 2022 14:54:49 +0200 Subject: [PATCH 2/3] Manifest: require class_group_vdf >= 0.0.4 --- manifest/main.ml | 2 +- opam/tezos-protocol-environment.opam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 54b83fcb4409..96188db914af 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -335,7 +335,7 @@ let zarith_stubs_js = external_lib ~js_compatible:true "zarith_stubs_js" V.True let ledgerwallet_tezos = vendored_lib "ledgerwallet-tezos" let vdf = - external_lib ~js_compatible:true "class_group_vdf" V.(at_least "0.0.2") + external_lib ~js_compatible:true "class_group_vdf" V.(at_least "0.0.4") (* INTERNAL LIBS *) diff --git a/opam/tezos-protocol-environment.opam b/opam/tezos-protocol-environment.opam index ea454837f676..b1fe49eda544 100644 --- a/opam/tezos-protocol-environment.opam +++ b/opam/tezos-protocol-environment.opam @@ -19,7 +19,7 @@ depends: [ "tezos-plonk" { >= "0.1.0" } "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" - "class_group_vdf" { >= "0.0.2" } + "class_group_vdf" { >= "0.0.4" } "ringo" { >= "0.9" } "ringo-lwt" { >= "0.9" } "tezos-base" -- GitLab From cca070de61fcc78cbe7e009c40858c9e4efeb49e Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Wed, 27 Jul 2022 15:53:15 +0200 Subject: [PATCH 3/3] Manifest: update to irmin.3.3.2 --- manifest/main.ml | 2 +- opam/tezos-context.opam | 2 +- opam/tezos-dal-node.opam | 2 +- opam/tezos-sc-rollup-node-013-PtJakart.opam | 2 +- opam/tezos-sc-rollup-node-014-PtKathma.opam | 2 +- opam/tezos-sc-rollup-node-alpha.opam | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 96188db914af..89175ac109d0 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -174,7 +174,7 @@ let ipaddr = let ipaddr_unix = external_sublib ipaddr "ipaddr.unix" -let irmin = external_lib "irmin" V.(at_least "3.3.1" && less_than "3.4.0") +let irmin = external_lib "irmin" V.(at_least "3.3.2" && less_than "3.4.0") let irmin_pack = external_lib "irmin-pack" V.(at_least "3.3.1" && less_than "3.4.0") diff --git a/opam/tezos-context.opam b/opam/tezos-context.opam index 4db2365d64f5..9958722c3a09 100644 --- a/opam/tezos-context.opam +++ b/opam/tezos-context.opam @@ -12,7 +12,7 @@ depends: [ "tezos-base" "tezos-stdlib" "tezos-shell-services" - "irmin" { >= "3.3.1" & < "3.4.0" } + "irmin" { >= "3.3.2" & < "3.4.0" } "irmin-pack" { >= "3.3.1" & < "3.4.0" } "tezos-stdlib-unix" "fmt" { >= "0.8.7" } diff --git a/opam/tezos-dal-node.opam b/opam/tezos-dal-node.opam index f3f202cf0f16..429ae43c0e99 100644 --- a/opam/tezos-dal-node.opam +++ b/opam/tezos-dal-node.opam @@ -20,7 +20,7 @@ depends: [ "tezos-stdlib" "tezos-crypto" "irmin-pack" { >= "3.3.1" & < "3.4.0" } - "irmin" { >= "3.3.1" & < "3.4.0" } + "irmin" { >= "3.3.2" & < "3.4.0" } ] build: [ ["rm" "-r" "vendors"] diff --git a/opam/tezos-sc-rollup-node-013-PtJakart.opam b/opam/tezos-sc-rollup-node-013-PtJakart.opam index c34a2913d5a7..1da6dab3833a 100644 --- a/opam/tezos-sc-rollup-node-013-PtJakart.opam +++ b/opam/tezos-sc-rollup-node-013-PtJakart.opam @@ -25,7 +25,7 @@ depends: [ "tezos-sc-rollup-013-PtJakart" "data-encoding" { >= "0.6" & < "0.7" } "irmin-pack" { >= "3.3.1" & < "3.4.0" } - "irmin" { >= "3.3.1" & < "3.4.0" } + "irmin" { >= "3.3.2" & < "3.4.0" } "ringo" { >= "0.9" } "ringo-lwt" { >= "0.9" } "tezos-injector-013-PtJakart" diff --git a/opam/tezos-sc-rollup-node-014-PtKathma.opam b/opam/tezos-sc-rollup-node-014-PtKathma.opam index bd3f8d21f4c8..df186f5b71de 100644 --- a/opam/tezos-sc-rollup-node-014-PtKathma.opam +++ b/opam/tezos-sc-rollup-node-014-PtKathma.opam @@ -25,7 +25,7 @@ depends: [ "tezos-sc-rollup-014-PtKathma" "data-encoding" { >= "0.6" & < "0.7" } "irmin-pack" { >= "3.3.1" & < "3.4.0" } - "irmin" { >= "3.3.1" & < "3.4.0" } + "irmin" { >= "3.3.2" & < "3.4.0" } "ringo" { >= "0.9" } "ringo-lwt" { >= "0.9" } "tezos-injector-014-PtKathma" diff --git a/opam/tezos-sc-rollup-node-alpha.opam b/opam/tezos-sc-rollup-node-alpha.opam index 29371063b70a..493d15e16f64 100644 --- a/opam/tezos-sc-rollup-node-alpha.opam +++ b/opam/tezos-sc-rollup-node-alpha.opam @@ -25,7 +25,7 @@ depends: [ "tezos-sc-rollup-alpha" "data-encoding" { >= "0.6" & < "0.7" } "irmin-pack" { >= "3.3.1" & < "3.4.0" } - "irmin" { >= "3.3.1" & < "3.4.0" } + "irmin" { >= "3.3.2" & < "3.4.0" } "ringo" { >= "0.9" } "ringo-lwt" { >= "0.9" } "tezos-injector-alpha" -- GitLab