From 08a5c5e9d113c7e3063707b2a1f61eeb2cb792e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Tue, 27 Sep 2022 10:15:40 +0200 Subject: [PATCH] Manifest: update ringo constraints --- manifest/main.ml | 6 +++++- opam/tezos-crypto.opam | 2 +- opam/tezos-p2p.opam | 2 +- opam/tezos-protocol-environment.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 +- opam/tezos-stdlib.opam | 2 +- opam/tezos-workers.opam | 2 +- 9 files changed, 13 insertions(+), 9 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index b60782a2c5fa..6127f850e41a 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -290,7 +290,11 @@ let resto_cohttp_server = external_lib "resto-cohttp-server" resto_version let resto_directory = external_lib ~js_compatible:true "resto-directory" resto_version -let ringo = external_lib ~js_compatible:true "ringo" V.(at_least "0.9") +let ringo = + external_lib + ~js_compatible:true + "ringo" + V.(at_least "0.9" && less_than "1.0.0") let ringo_lwt = external_lib "ringo-lwt" V.(at_least "0.9") diff --git a/opam/tezos-crypto.opam b/opam/tezos-crypto.opam index e5b66ad4de73..5f97f92e23f9 100644 --- a/opam/tezos-crypto.opam +++ b/opam/tezos-crypto.opam @@ -17,7 +17,7 @@ depends: [ "secp256k1-internal" { >= "0.3.0" } "tezos-error-monad" "tezos-rpc" - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" "bls12-381" { >= "4.0.0" & < "4.1.0" } diff --git a/opam/tezos-p2p.opam b/opam/tezos-p2p.opam index 30faab44ff01..a2b327848c03 100644 --- a/opam/tezos-p2p.opam +++ b/opam/tezos-p2p.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "lwt-watcher" { = "0.2" } "lwt-canceler" { >= "0.3" & < "0.4" } - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "tezos-base" "tezos-stdlib-unix" "tezos-stdlib" diff --git a/opam/tezos-protocol-environment.opam b/opam/tezos-protocol-environment.opam index b1fe49eda544..1603cd4893c5 100644 --- a/opam/tezos-protocol-environment.opam +++ b/opam/tezos-protocol-environment.opam @@ -20,7 +20,7 @@ depends: [ "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" "class_group_vdf" { >= "0.0.4" } - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "ringo-lwt" { >= "0.9" } "tezos-base" "tezos-sapling" diff --git a/opam/tezos-sc-rollup-node-013-PtJakart.opam b/opam/tezos-sc-rollup-node-013-PtJakart.opam index 1da6dab3833a..f65009b7c1d2 100644 --- a/opam/tezos-sc-rollup-node-013-PtJakart.opam +++ b/opam/tezos-sc-rollup-node-013-PtJakart.opam @@ -26,7 +26,7 @@ depends: [ "data-encoding" { >= "0.6" & < "0.7" } "irmin-pack" { >= "3.3.1" & < "3.4.0" } "irmin" { >= "3.3.2" & < "3.4.0" } - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "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 df186f5b71de..b3b9fdeafcf8 100644 --- a/opam/tezos-sc-rollup-node-014-PtKathma.opam +++ b/opam/tezos-sc-rollup-node-014-PtKathma.opam @@ -26,7 +26,7 @@ depends: [ "data-encoding" { >= "0.6" & < "0.7" } "irmin-pack" { >= "3.3.1" & < "3.4.0" } "irmin" { >= "3.3.2" & < "3.4.0" } - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "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 493d15e16f64..022bfe7903ff 100644 --- a/opam/tezos-sc-rollup-node-alpha.opam +++ b/opam/tezos-sc-rollup-node-alpha.opam @@ -26,7 +26,7 @@ depends: [ "data-encoding" { >= "0.6" & < "0.7" } "irmin-pack" { >= "3.3.1" & < "3.4.0" } "irmin" { >= "3.3.2" & < "3.4.0" } - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "ringo-lwt" { >= "0.9" } "tezos-injector-alpha" ] diff --git a/opam/tezos-stdlib.opam b/opam/tezos-stdlib.opam index 8bc54af8da8a..ef84975434ed 100644 --- a/opam/tezos-stdlib.opam +++ b/opam/tezos-stdlib.opam @@ -15,7 +15,7 @@ depends: [ "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" "lwt" { >= "5.4.0" } - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "alcotest" { with-test & >= "1.5.0" } "bigstring" {with-test} "tezos-test-helpers" {with-test} diff --git a/opam/tezos-workers.opam b/opam/tezos-workers.opam index 07bc821349b8..781772c11b79 100644 --- a/opam/tezos-workers.opam +++ b/opam/tezos-workers.opam @@ -11,7 +11,7 @@ depends: [ "dune" { >= "3.0" } "tezos-base" "tezos-stdlib-unix" - "ringo" { >= "0.9" } + "ringo" { >= "0.9" & < "1.0.0" } "tezos-stdlib" {with-test} "tezos-test-helpers" {with-test} "tezos-base-test-helpers" {with-test} -- GitLab