From e461e2474b0075ffc17ea91b44e0fe20225ff60b Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Wed, 11 May 2022 00:43:40 +0200 Subject: [PATCH 1/9] Everywhere: lift dune constraint --- manifest/manifest.ml | 4 +--- opam/internal-devtools.opam | 2 +- opam/tezos-012-Psithaca-test-helpers.opam | 2 +- opam/tezos-013-PtJakart-test-helpers.opam | 2 +- opam/tezos-accuser-012-Psithaca.opam | 2 +- opam/tezos-accuser-013-PtJakart.opam | 2 +- opam/tezos-accuser-alpha.opam | 2 +- opam/tezos-alpha-test-helpers.opam | 2 +- opam/tezos-baker-012-Psithaca.opam | 2 +- opam/tezos-baker-013-PtJakart.opam | 2 +- opam/tezos-baker-alpha.opam | 2 +- opam/tezos-baking-012-Psithaca-commands.opam | 2 +- opam/tezos-baking-012-Psithaca.opam | 2 +- opam/tezos-baking-013-PtJakart-commands.opam | 2 +- opam/tezos-baking-013-PtJakart.opam | 2 +- opam/tezos-baking-alpha-commands.opam | 2 +- opam/tezos-baking-alpha.opam | 2 +- opam/tezos-base-test-helpers.opam | 2 +- opam/tezos-base.opam | 2 +- opam/tezos-benchmark-012-Psithaca.opam | 2 +- opam/tezos-benchmark-013-PtJakart.opam | 2 +- opam/tezos-benchmark-alpha.opam | 2 +- opam/tezos-benchmark-examples.opam | 2 +- opam/tezos-benchmark-tests.opam | 2 +- opam/tezos-benchmark-type-inference-012-Psithaca.opam | 2 +- opam/tezos-benchmark-type-inference-013-PtJakart.opam | 2 +- opam/tezos-benchmark-type-inference-alpha.opam | 2 +- opam/tezos-benchmark.opam | 2 +- opam/tezos-benchmarks-proto-012-Psithaca.opam | 2 +- opam/tezos-benchmarks-proto-013-PtJakart.opam | 2 +- opam/tezos-benchmarks-proto-alpha.opam | 2 +- opam/tezos-clic.opam | 2 +- opam/tezos-client-000-Ps9mPmXa.opam | 2 +- opam/tezos-client-001-PtCJ7pwo.opam | 2 +- opam/tezos-client-002-PsYLVpVv.opam | 2 +- opam/tezos-client-003-PsddFKi3.opam | 2 +- opam/tezos-client-004-Pt24m4xi.opam | 2 +- opam/tezos-client-005-PsBabyM1.opam | 2 +- opam/tezos-client-006-PsCARTHA.opam | 2 +- opam/tezos-client-007-PsDELPH1.opam | 2 +- opam/tezos-client-008-PtEdo2Zk.opam | 2 +- opam/tezos-client-009-PsFLoren.opam | 2 +- opam/tezos-client-010-PtGRANAD.opam | 2 +- opam/tezos-client-011-PtHangz2.opam | 2 +- opam/tezos-client-012-Psithaca.opam | 2 +- opam/tezos-client-013-PtJakart.opam | 2 +- opam/tezos-client-alpha.opam | 2 +- opam/tezos-client-base-unix.opam | 2 +- opam/tezos-client-base.opam | 2 +- opam/tezos-client-commands.opam | 2 +- opam/tezos-client-demo-counter.opam | 2 +- opam/tezos-client-genesis.opam | 2 +- opam/tezos-client.opam | 2 +- opam/tezos-codec.opam | 2 +- opam/tezos-context.opam | 2 +- opam/tezos-crypto.opam | 2 +- opam/tezos-embedded-protocol-000-Ps9mPmXa.opam | 2 +- opam/tezos-embedded-protocol-001-PtCJ7pwo.opam | 2 +- opam/tezos-embedded-protocol-002-PsYLVpVv.opam | 2 +- opam/tezos-embedded-protocol-003-PsddFKi3.opam | 2 +- opam/tezos-embedded-protocol-004-Pt24m4xi.opam | 2 +- opam/tezos-embedded-protocol-005-PsBABY5H.opam | 2 +- opam/tezos-embedded-protocol-005-PsBabyM1.opam | 2 +- opam/tezos-embedded-protocol-006-PsCARTHA.opam | 2 +- opam/tezos-embedded-protocol-007-PsDELPH1.opam | 2 +- opam/tezos-embedded-protocol-008-PtEdo2Zk.opam | 2 +- opam/tezos-embedded-protocol-008-PtEdoTez.opam | 2 +- opam/tezos-embedded-protocol-009-PsFLoren.opam | 2 +- opam/tezos-embedded-protocol-010-PtGRANAD.opam | 2 +- opam/tezos-embedded-protocol-011-PtHangz2.opam | 2 +- opam/tezos-embedded-protocol-012-Psithaca.opam | 2 +- opam/tezos-embedded-protocol-013-PtJakart.opam | 2 +- opam/tezos-embedded-protocol-alpha.opam | 2 +- opam/tezos-embedded-protocol-demo-counter.opam | 2 +- opam/tezos-embedded-protocol-demo-noops.opam | 2 +- opam/tezos-embedded-protocol-genesis.opam | 2 +- opam/tezos-error-monad.opam | 2 +- opam/tezos-event-logging-test-helpers.opam | 2 +- opam/tezos-event-logging.opam | 2 +- opam/tezos-hacl.opam | 2 +- opam/tezos-injector-013-PtJakart.opam | 2 +- opam/tezos-injector-alpha.opam | 2 +- opam/tezos-lwt-result-stdlib.opam | 2 +- opam/tezos-micheline-rewriting.opam | 2 +- opam/tezos-micheline.opam | 2 +- opam/tezos-mockup-commands.opam | 2 +- opam/tezos-mockup-proxy.opam | 2 +- opam/tezos-mockup-registration.opam | 2 +- opam/tezos-mockup.opam | 2 +- opam/tezos-node.opam | 2 +- opam/tezos-openapi.opam | 2 +- opam/tezos-p2p-services.opam | 2 +- opam/tezos-p2p.opam | 2 +- opam/tezos-polynomial.opam | 2 +- opam/tezos-protocol-000-Ps9mPmXa.opam | 2 +- opam/tezos-protocol-001-PtCJ7pwo.opam | 2 +- opam/tezos-protocol-002-PsYLVpVv.opam | 2 +- opam/tezos-protocol-003-PsddFKi3.opam | 2 +- opam/tezos-protocol-004-Pt24m4xi.opam | 2 +- opam/tezos-protocol-005-PsBABY5H.opam | 2 +- opam/tezos-protocol-005-PsBabyM1.opam | 2 +- opam/tezos-protocol-006-PsCARTHA.opam | 2 +- opam/tezos-protocol-007-PsDELPH1.opam | 2 +- opam/tezos-protocol-008-PtEdo2Zk.opam | 2 +- opam/tezos-protocol-008-PtEdoTez.opam | 2 +- opam/tezos-protocol-009-PsFLoren.opam | 2 +- opam/tezos-protocol-010-PtGRANAD.opam | 2 +- opam/tezos-protocol-011-PtHangz2.opam | 2 +- opam/tezos-protocol-012-Psithaca-tests.opam | 2 +- opam/tezos-protocol-012-Psithaca.opam | 2 +- opam/tezos-protocol-013-PtJakart-tests.opam | 2 +- opam/tezos-protocol-013-PtJakart.opam | 2 +- opam/tezos-protocol-alpha-tests.opam | 2 +- opam/tezos-protocol-alpha.opam | 2 +- opam/tezos-protocol-compiler.opam | 2 +- opam/tezos-protocol-demo-counter.opam | 2 +- opam/tezos-protocol-demo-noops.opam | 2 +- opam/tezos-protocol-environment.opam | 2 +- opam/tezos-protocol-genesis.opam | 2 +- opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam | 2 +- opam/tezos-protocol-plugin-007-PsDELPH1.opam | 2 +- opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam | 2 +- opam/tezos-protocol-plugin-008-PtEdo2Zk.opam | 2 +- opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam | 2 +- opam/tezos-protocol-plugin-009-PsFLoren.opam | 2 +- opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam | 2 +- opam/tezos-protocol-plugin-010-PtGRANAD.opam | 2 +- opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam | 2 +- opam/tezos-protocol-plugin-011-PtHangz2.opam | 2 +- opam/tezos-protocol-plugin-012-Psithaca-registerer.opam | 2 +- opam/tezos-protocol-plugin-012-Psithaca-tests.opam | 2 +- opam/tezos-protocol-plugin-012-Psithaca.opam | 2 +- opam/tezos-protocol-plugin-013-PtJakart-registerer.opam | 2 +- opam/tezos-protocol-plugin-013-PtJakart-tests.opam | 2 +- opam/tezos-protocol-plugin-013-PtJakart.opam | 2 +- opam/tezos-protocol-plugin-alpha-registerer.opam | 2 +- opam/tezos-protocol-plugin-alpha-tests.opam | 2 +- opam/tezos-protocol-plugin-alpha.opam | 2 +- opam/tezos-protocol-updater.opam | 2 +- opam/tezos-proxy-server-config.opam | 2 +- opam/tezos-proxy-server.opam | 2 +- opam/tezos-proxy.opam | 2 +- opam/tezos-requester.opam | 2 +- opam/tezos-rpc-http-client-unix.opam | 2 +- opam/tezos-rpc-http-client.opam | 2 +- opam/tezos-rpc-http-server.opam | 2 +- opam/tezos-rpc-http.opam | 2 +- opam/tezos-rpc.opam | 2 +- opam/tezos-sapling.opam | 2 +- opam/tezos-sc-rollup-013-PtJakart.opam | 2 +- opam/tezos-sc-rollup-alpha.opam | 2 +- opam/tezos-sc-rollup-client-013-PtJakart.opam | 2 +- opam/tezos-sc-rollup-client-alpha.opam | 2 +- opam/tezos-sc-rollup-node-013-PtJakart.opam | 2 +- opam/tezos-sc-rollup-node-alpha.opam | 2 +- opam/tezos-scoru-wasm.opam | 2 +- opam/tezos-shell-benchmarks.opam | 2 +- opam/tezos-shell-context-test.opam | 2 +- opam/tezos-shell-context.opam | 2 +- opam/tezos-shell-services-test-helpers.opam | 2 +- opam/tezos-shell-services.opam | 2 +- opam/tezos-shell.opam | 2 +- opam/tezos-signer-backends.opam | 2 +- opam/tezos-signer-services.opam | 2 +- opam/tezos-signer.opam | 2 +- opam/tezos-snoop.opam | 2 +- opam/tezos-stdlib-unix.opam | 2 +- opam/tezos-stdlib.opam | 2 +- opam/tezos-store.opam | 2 +- opam/tezos-test-helpers-extra.opam | 2 +- opam/tezos-test-helpers.opam | 2 +- opam/tezos-tooling.opam | 2 +- opam/tezos-tps-evaluation.opam | 2 +- opam/tezos-tx-rollup-013-PtJakart.opam | 2 +- opam/tezos-tx-rollup-alpha.opam | 2 +- opam/tezos-tx-rollup-client-013-PtJakart.opam | 2 +- opam/tezos-tx-rollup-client-alpha.opam | 2 +- opam/tezos-tx-rollup-node-013-PtJakart.opam | 2 +- opam/tezos-tx-rollup-node-alpha.opam | 2 +- opam/tezos-validation.opam | 2 +- opam/tezos-validator.opam | 2 +- opam/tezos-version.opam | 2 +- opam/tezos-webassembly-interpreter.opam | 2 +- opam/tezos-workers.opam | 2 +- opam/tezt-performance-regression.opam | 2 +- opam/tezt-self-tests.opam | 2 +- opam/tezt-tezos.opam | 2 +- opam/tezt.opam | 2 +- 188 files changed, 188 insertions(+), 190 deletions(-) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index da6b385bbd9b..52b15797c6c6 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -1955,9 +1955,7 @@ let generate_opam ?release for_package (internals : Target.internal list) : let depends = { Opam.package = "dune"; - (* We artificially constrain the version of dune to split the tooling - upgrade. This is temporary. *) - version = Version.(and_list [at_least "2.9"; less_than "3.0"]); + version = Version.at_least "3.0"; with_test = false; optional = false; } diff --git a/opam/internal-devtools.opam b/opam/internal-devtools.opam index f9e3b304a32a..39acfabec7c2 100644 --- a/opam/internal-devtools.opam +++ b/opam/internal-devtools.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "num" "re" { >= "1.7.2" } "tezos-protocol-compiler" diff --git a/opam/tezos-012-Psithaca-test-helpers.opam b/opam/tezos-012-Psithaca-test-helpers.opam index af898fbffa63..431f5832c599 100644 --- a/opam/tezos-012-Psithaca-test-helpers.opam +++ b/opam/tezos-012-Psithaca-test-helpers.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "alcotest-lwt" { >= "1.5.0" } "qcheck-alcotest" { >= "0.15" } "tezos-test-helpers" diff --git a/opam/tezos-013-PtJakart-test-helpers.opam b/opam/tezos-013-PtJakart-test-helpers.opam index cef2c5d32bc6..12dc6ce61da6 100644 --- a/opam/tezos-013-PtJakart-test-helpers.opam +++ b/opam/tezos-013-PtJakart-test-helpers.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "alcotest-lwt" { >= "1.5.0" } "qcheck-alcotest" { >= "0.15" } "tezos-test-helpers" diff --git a/opam/tezos-accuser-012-Psithaca.opam b/opam/tezos-accuser-012-Psithaca.opam index c94b02ee6a50..cc1b488debb0 100644 --- a/opam/tezos-accuser-012-Psithaca.opam +++ b/opam/tezos-accuser-012-Psithaca.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-012-Psithaca" "tezos-client-012-Psithaca" diff --git a/opam/tezos-accuser-013-PtJakart.opam b/opam/tezos-accuser-013-PtJakart.opam index e66e95478e2a..f0e541714fc3 100644 --- a/opam/tezos-accuser-013-PtJakart.opam +++ b/opam/tezos-accuser-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" diff --git a/opam/tezos-accuser-alpha.opam b/opam/tezos-accuser-alpha.opam index 0b38accaf47c..b42cbd44814d 100644 --- a/opam/tezos-accuser-alpha.opam +++ b/opam/tezos-accuser-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-alpha" "tezos-client-alpha" diff --git a/opam/tezos-alpha-test-helpers.opam b/opam/tezos-alpha-test-helpers.opam index bc48912ae998..66243e3846db 100644 --- a/opam/tezos-alpha-test-helpers.opam +++ b/opam/tezos-alpha-test-helpers.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "alcotest-lwt" { >= "1.5.0" } "qcheck-alcotest" { >= "0.15" } "tezos-test-helpers" diff --git a/opam/tezos-baker-012-Psithaca.opam b/opam/tezos-baker-012-Psithaca.opam index 3b7d6338bf9e..7bff25343f2d 100644 --- a/opam/tezos-baker-012-Psithaca.opam +++ b/opam/tezos-baker-012-Psithaca.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-012-Psithaca" "tezos-client-012-Psithaca" diff --git a/opam/tezos-baker-013-PtJakart.opam b/opam/tezos-baker-013-PtJakart.opam index 68bd28a4846a..76a9e9beea8c 100644 --- a/opam/tezos-baker-013-PtJakart.opam +++ b/opam/tezos-baker-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" diff --git a/opam/tezos-baker-alpha.opam b/opam/tezos-baker-alpha.opam index 74e307325eb9..445ea5e2f2b2 100644 --- a/opam/tezos-baker-alpha.opam +++ b/opam/tezos-baker-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-alpha" "tezos-client-alpha" diff --git a/opam/tezos-baking-012-Psithaca-commands.opam b/opam/tezos-baking-012-Psithaca-commands.opam index e67292a0fdc8..97309b79638d 100644 --- a/opam/tezos-baking-012-Psithaca-commands.opam +++ b/opam/tezos-baking-012-Psithaca-commands.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-012-Psithaca" "tezos-stdlib-unix" diff --git a/opam/tezos-baking-012-Psithaca.opam b/opam/tezos-baking-012-Psithaca.opam index 183509f35e89..c1f456994970 100644 --- a/opam/tezos-baking-012-Psithaca.opam +++ b/opam/tezos-baking-012-Psithaca.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-version" "tezos-protocol-012-Psithaca" diff --git a/opam/tezos-baking-013-PtJakart-commands.opam b/opam/tezos-baking-013-PtJakart-commands.opam index 454fc0547f7e..9e0d9b72fa13 100644 --- a/opam/tezos-baking-013-PtJakart-commands.opam +++ b/opam/tezos-baking-013-PtJakart-commands.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-013-PtJakart" "tezos-stdlib-unix" diff --git a/opam/tezos-baking-013-PtJakart.opam b/opam/tezos-baking-013-PtJakart.opam index c5b0ae448083..40f9304bae83 100644 --- a/opam/tezos-baking-013-PtJakart.opam +++ b/opam/tezos-baking-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-version" "tezos-protocol-013-PtJakart" diff --git a/opam/tezos-baking-alpha-commands.opam b/opam/tezos-baking-alpha-commands.opam index fa9bd3d9bda9..c25a6e31087c 100644 --- a/opam/tezos-baking-alpha-commands.opam +++ b/opam/tezos-baking-alpha-commands.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-alpha" "tezos-stdlib-unix" diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam index f4fdb5bc1b45..49bf385dcfe0 100644 --- a/opam/tezos-baking-alpha.opam +++ b/opam/tezos-baking-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-version" "tezos-protocol-alpha" diff --git a/opam/tezos-base-test-helpers.opam b/opam/tezos-base-test-helpers.opam index 050ca980a93f..ac6430883c96 100644 --- a/opam/tezos-base-test-helpers.opam +++ b/opam/tezos-base-test-helpers.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-stdlib-unix" "tezos-event-logging-test-helpers" diff --git a/opam/tezos-base.opam b/opam/tezos-base.opam index f7bd9d7d9e73..1f9809ccb3e3 100644 --- a/opam/tezos-base.opam +++ b/opam/tezos-base.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "tezos-crypto" "data-encoding" { >= "0.5.3" & < "0.6" } diff --git a/opam/tezos-benchmark-012-Psithaca.opam b/opam/tezos-benchmark-012-Psithaca.opam index 22fc9be89c5f..1fdd4ef74e01 100644 --- a/opam/tezos-benchmark-012-Psithaca.opam +++ b/opam/tezos-benchmark-012-Psithaca.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-benchmark-013-PtJakart.opam b/opam/tezos-benchmark-013-PtJakart.opam index bf7c9bcb6bd4..b65301146d15 100644 --- a/opam/tezos-benchmark-013-PtJakart.opam +++ b/opam/tezos-benchmark-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-benchmark-alpha.opam b/opam/tezos-benchmark-alpha.opam index 5ae78dec1136..eb7509433889 100644 --- a/opam/tezos-benchmark-alpha.opam +++ b/opam/tezos-benchmark-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-benchmark-examples.opam b/opam/tezos-benchmark-examples.opam index bfa22d6bc193..5253f718f254 100644 --- a/opam/tezos-benchmark-examples.opam +++ b/opam/tezos-benchmark-examples.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-stdlib-unix" "tezos-crypto" diff --git a/opam/tezos-benchmark-tests.opam b/opam/tezos-benchmark-tests.opam index c9d3dd971481..759611935b18 100644 --- a/opam/tezos-benchmark-tests.opam +++ b/opam/tezos-benchmark-tests.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "alcotest-lwt" { with-test & >= "1.5.0" } "tezos-base" {with-test} "tezos-stdlib-unix" {with-test} diff --git a/opam/tezos-benchmark-type-inference-012-Psithaca.opam b/opam/tezos-benchmark-type-inference-012-Psithaca.opam index 8bb75616ff5c..c6485fbc9a5c 100644 --- a/opam/tezos-benchmark-type-inference-012-Psithaca.opam +++ b/opam/tezos-benchmark-type-inference-012-Psithaca.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "tezos-error-monad" "tezos-crypto" diff --git a/opam/tezos-benchmark-type-inference-013-PtJakart.opam b/opam/tezos-benchmark-type-inference-013-PtJakart.opam index 610e0120385e..88ff358489fc 100644 --- a/opam/tezos-benchmark-type-inference-013-PtJakart.opam +++ b/opam/tezos-benchmark-type-inference-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "tezos-error-monad" "tezos-crypto" diff --git a/opam/tezos-benchmark-type-inference-alpha.opam b/opam/tezos-benchmark-type-inference-alpha.opam index 219f32ae512d..5a9178e5abc0 100644 --- a/opam/tezos-benchmark-type-inference-alpha.opam +++ b/opam/tezos-benchmark-type-inference-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "tezos-error-monad" "tezos-crypto" diff --git a/opam/tezos-benchmark.opam b/opam/tezos-benchmark.opam index 216cc5592d66..33485efb7bfc 100644 --- a/opam/tezos-benchmark.opam +++ b/opam/tezos-benchmark.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-stdlib-unix" "tezos-micheline" diff --git a/opam/tezos-benchmarks-proto-012-Psithaca.opam b/opam/tezos-benchmarks-proto-012-Psithaca.opam index bcab6c35e778..907e57f78f4b 100644 --- a/opam/tezos-benchmarks-proto-012-Psithaca.opam +++ b/opam/tezos-benchmarks-proto-012-Psithaca.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-benchmarks-proto-013-PtJakart.opam b/opam/tezos-benchmarks-proto-013-PtJakart.opam index fa4d26a1872c..a85b4f0f9c75 100644 --- a/opam/tezos-benchmarks-proto-013-PtJakart.opam +++ b/opam/tezos-benchmarks-proto-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-benchmarks-proto-alpha.opam b/opam/tezos-benchmarks-proto-alpha.opam index bfb620f3d63e..f994c9cb9245 100644 --- a/opam/tezos-benchmarks-proto-alpha.opam +++ b/opam/tezos-benchmarks-proto-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-clic.opam b/opam/tezos-clic.opam index e9c218350f7e..a69e05f45bbf 100644 --- a/opam/tezos-clic.opam +++ b/opam/tezos-clic.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "lwt" { >= "5.4.0" } "re" { >= "1.7.2" } diff --git a/opam/tezos-client-000-Ps9mPmXa.opam b/opam/tezos-client-000-Ps9mPmXa.opam index 1dc32fbf62f3..177fe2ed48ab 100644 --- a/opam/tezos-client-000-Ps9mPmXa.opam +++ b/opam/tezos-client-000-Ps9mPmXa.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-001-PtCJ7pwo.opam b/opam/tezos-client-001-PtCJ7pwo.opam index f0e7eaf2de68..a98874b8f9fd 100644 --- a/opam/tezos-client-001-PtCJ7pwo.opam +++ b/opam/tezos-client-001-PtCJ7pwo.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-002-PsYLVpVv.opam b/opam/tezos-client-002-PsYLVpVv.opam index 131a50351e86..564b0ff63e53 100644 --- a/opam/tezos-client-002-PsYLVpVv.opam +++ b/opam/tezos-client-002-PsYLVpVv.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-003-PsddFKi3.opam b/opam/tezos-client-003-PsddFKi3.opam index 930be83ea84f..ea798f74c2a8 100644 --- a/opam/tezos-client-003-PsddFKi3.opam +++ b/opam/tezos-client-003-PsddFKi3.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-004-Pt24m4xi.opam b/opam/tezos-client-004-Pt24m4xi.opam index 76d224ea309c..bfe3c15cf245 100644 --- a/opam/tezos-client-004-Pt24m4xi.opam +++ b/opam/tezos-client-004-Pt24m4xi.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-005-PsBabyM1.opam b/opam/tezos-client-005-PsBabyM1.opam index 3385331c8960..892db781e9f1 100644 --- a/opam/tezos-client-005-PsBabyM1.opam +++ b/opam/tezos-client-005-PsBabyM1.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-006-PsCARTHA.opam b/opam/tezos-client-006-PsCARTHA.opam index d7120184325c..69744a2de1ba 100644 --- a/opam/tezos-client-006-PsCARTHA.opam +++ b/opam/tezos-client-006-PsCARTHA.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-007-PsDELPH1.opam b/opam/tezos-client-007-PsDELPH1.opam index f5d8b54a986c..fcccabac450c 100644 --- a/opam/tezos-client-007-PsDELPH1.opam +++ b/opam/tezos-client-007-PsDELPH1.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/tezos-client-008-PtEdo2Zk.opam index 3d4127b917d0..04f051a9f39d 100644 --- a/opam/tezos-client-008-PtEdo2Zk.opam +++ b/opam/tezos-client-008-PtEdo2Zk.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/tezos-client-009-PsFLoren.opam index 9dc8f9fbc26f..50bdbf0e5f62 100644 --- a/opam/tezos-client-009-PsFLoren.opam +++ b/opam/tezos-client-009-PsFLoren.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "tezos-base" "tezos-shell-services" diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/tezos-client-010-PtGRANAD.opam index 3906f4aef3da..72c68fb7216c 100644 --- a/opam/tezos-client-010-PtGRANAD.opam +++ b/opam/tezos-client-010-PtGRANAD.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "tezos-base" "tezos-shell-services" diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/tezos-client-011-PtHangz2.opam index b12703e3f607..f79666df7294 100644 --- a/opam/tezos-client-011-PtHangz2.opam +++ b/opam/tezos-client-011-PtHangz2.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "tezos-base" "tezos-shell-services" diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/tezos-client-012-Psithaca.opam index 82dd2eca483e..830b6e6888fe 100644 --- a/opam/tezos-client-012-Psithaca.opam +++ b/opam/tezos-client-012-Psithaca.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "tezos-base" "tezos-shell-services" diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/tezos-client-013-PtJakart.opam index da5beb29f1dc..33a6058b3ccb 100644 --- a/opam/tezos-client-013-PtJakart.opam +++ b/opam/tezos-client-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "tezos-base" "tezos-shell-services" diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam index ffe912cb4086..f4417bb62f55 100644 --- a/opam/tezos-client-alpha.opam +++ b/opam/tezos-client-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "tezos-base" "tezos-shell-services" diff --git a/opam/tezos-client-base-unix.opam b/opam/tezos-client-base-unix.opam index 8b99e04276c2..7cae2f4d6c51 100644 --- a/opam/tezos-client-base-unix.opam +++ b/opam/tezos-client-base-unix.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-rpc-http" "tezos-rpc-http-client-unix" diff --git a/opam/tezos-client-base.opam b/opam/tezos-client-base.opam index cba682218282..0a0609b80687 100644 --- a/opam/tezos-client-base.opam +++ b/opam/tezos-client-base.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-rpc" "tezos-shell-services" diff --git a/opam/tezos-client-commands.opam b/opam/tezos-client-commands.opam index 993f18cea56c..be9c4fd6bab6 100644 --- a/opam/tezos-client-commands.opam +++ b/opam/tezos-client-commands.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-rpc" "tezos-clic" diff --git a/opam/tezos-client-demo-counter.opam b/opam/tezos-client-demo-counter.opam index 92d1f0bd78cc..8dae6761e709 100644 --- a/opam/tezos-client-demo-counter.opam +++ b/opam/tezos-client-demo-counter.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client-genesis.opam b/opam/tezos-client-genesis.opam index 478dfc3a10f8..22376ba2f79f 100644 --- a/opam/tezos-client-genesis.opam +++ b/opam/tezos-client-genesis.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/opam/tezos-client.opam b/opam/tezos-client.opam index 837e37e24168..dc07fe60fa19 100644 --- a/opam/tezos-client.opam +++ b/opam/tezos-client.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-rpc-http-client" "tezos-stdlib-unix" diff --git a/opam/tezos-codec.opam b/opam/tezos-codec.opam index 2ae4830ee6d3..b2573dc54152 100644 --- a/opam/tezos-codec.opam +++ b/opam/tezos-codec.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "data-encoding" { >= "0.5.3" & < "0.6" } "tezos-base" "tezos-client-base-unix" diff --git a/opam/tezos-context.opam b/opam/tezos-context.opam index 06cf45924651..bd92b798b40d 100644 --- a/opam/tezos-context.opam +++ b/opam/tezos-context.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-stdlib" "irmin" { >= "3.2.2" & < "3.3.0" } diff --git a/opam/tezos-crypto.opam b/opam/tezos-crypto.opam index b79829907f6e..0953835f618d 100644 --- a/opam/tezos-crypto.opam +++ b/opam/tezos-crypto.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "data-encoding" { >= "0.5.3" & < "0.6" } "tezos-lwt-result-stdlib" diff --git a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam index fe9c237781a1..943eeb4c2bb4 100644 --- a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-000-Ps9mPmXa" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam index ff6fdfdb40db..77002b49944d 100644 --- a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-001-PtCJ7pwo" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam index 93999e457b1f..0464faea699b 100644 --- a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-002-PsYLVpVv" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-003-PsddFKi3.opam b/opam/tezos-embedded-protocol-003-PsddFKi3.opam index 0e6a3fa2f801..26afc766626a 100644 --- a/opam/tezos-embedded-protocol-003-PsddFKi3.opam +++ b/opam/tezos-embedded-protocol-003-PsddFKi3.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-003-PsddFKi3" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam index f6f267cfd3ce..740b66390996 100644 --- a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-004-Pt24m4xi" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-005-PsBABY5H.opam b/opam/tezos-embedded-protocol-005-PsBABY5H.opam index ff72323df9aa..c2f4377276a6 100644 --- a/opam/tezos-embedded-protocol-005-PsBABY5H.opam +++ b/opam/tezos-embedded-protocol-005-PsBABY5H.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-005-PsBABY5H" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-005-PsBabyM1.opam b/opam/tezos-embedded-protocol-005-PsBabyM1.opam index 0f77d45ad205..08ac74f3adaf 100644 --- a/opam/tezos-embedded-protocol-005-PsBabyM1.opam +++ b/opam/tezos-embedded-protocol-005-PsBabyM1.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-005-PsBabyM1" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-006-PsCARTHA.opam b/opam/tezos-embedded-protocol-006-PsCARTHA.opam index 655779287810..7ab76999f074 100644 --- a/opam/tezos-embedded-protocol-006-PsCARTHA.opam +++ b/opam/tezos-embedded-protocol-006-PsCARTHA.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-006-PsCARTHA" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-007-PsDELPH1.opam b/opam/tezos-embedded-protocol-007-PsDELPH1.opam index fb5ab1a1d4ea..46cbd20c9850 100644 --- a/opam/tezos-embedded-protocol-007-PsDELPH1.opam +++ b/opam/tezos-embedded-protocol-007-PsDELPH1.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-007-PsDELPH1" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam index 8922492ffc44..ce8c53df47c8 100644 --- a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-008-PtEdo2Zk" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-008-PtEdoTez.opam b/opam/tezos-embedded-protocol-008-PtEdoTez.opam index 7bdacdde0acc..81fab1803e3a 100644 --- a/opam/tezos-embedded-protocol-008-PtEdoTez.opam +++ b/opam/tezos-embedded-protocol-008-PtEdoTez.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-008-PtEdoTez" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-009-PsFLoren.opam b/opam/tezos-embedded-protocol-009-PsFLoren.opam index 7a1c5f6d7595..77c7d10c4e8e 100644 --- a/opam/tezos-embedded-protocol-009-PsFLoren.opam +++ b/opam/tezos-embedded-protocol-009-PsFLoren.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-009-PsFLoren" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-010-PtGRANAD.opam b/opam/tezos-embedded-protocol-010-PtGRANAD.opam index c6152f8ceaee..8d614feee28c 100644 --- a/opam/tezos-embedded-protocol-010-PtGRANAD.opam +++ b/opam/tezos-embedded-protocol-010-PtGRANAD.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-010-PtGRANAD" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-011-PtHangz2.opam b/opam/tezos-embedded-protocol-011-PtHangz2.opam index 1572e89c126e..4e40cff123a9 100644 --- a/opam/tezos-embedded-protocol-011-PtHangz2.opam +++ b/opam/tezos-embedded-protocol-011-PtHangz2.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-011-PtHangz2" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-012-Psithaca.opam b/opam/tezos-embedded-protocol-012-Psithaca.opam index e4ec20ff1914..da877f16bbbf 100644 --- a/opam/tezos-embedded-protocol-012-Psithaca.opam +++ b/opam/tezos-embedded-protocol-012-Psithaca.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-012-Psithaca" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-013-PtJakart.opam b/opam/tezos-embedded-protocol-013-PtJakart.opam index 28e04a8939aa..2bb4a2572bae 100644 --- a/opam/tezos-embedded-protocol-013-PtJakart.opam +++ b/opam/tezos-embedded-protocol-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-013-PtJakart" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-alpha.opam b/opam/tezos-embedded-protocol-alpha.opam index 6269194e61c6..47c4f1fda680 100644 --- a/opam/tezos-embedded-protocol-alpha.opam +++ b/opam/tezos-embedded-protocol-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-alpha" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-demo-counter.opam b/opam/tezos-embedded-protocol-demo-counter.opam index 5f51d4560542..89b3f5a7acb2 100644 --- a/opam/tezos-embedded-protocol-demo-counter.opam +++ b/opam/tezos-embedded-protocol-demo-counter.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-demo-counter" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-demo-noops.opam b/opam/tezos-embedded-protocol-demo-noops.opam index 56fe1a42d3ec..55550add357c 100644 --- a/opam/tezos-embedded-protocol-demo-noops.opam +++ b/opam/tezos-embedded-protocol-demo-noops.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-demo-noops" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-embedded-protocol-genesis.opam b/opam/tezos-embedded-protocol-genesis.opam index fa5a5fdb4cc0..a30c49f1ddf6 100644 --- a/opam/tezos-embedded-protocol-genesis.opam +++ b/opam/tezos-embedded-protocol-genesis.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-genesis" "tezos-protocol-updater" "tezos-protocol-environment" diff --git a/opam/tezos-error-monad.opam b/opam/tezos-error-monad.opam index e0a675ca4813..1970de95b18a 100644 --- a/opam/tezos-error-monad.opam +++ b/opam/tezos-error-monad.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ocaml" { >= "4.07" } "tezos-stdlib" "data-encoding" { >= "0.5.3" & < "0.6" } diff --git a/opam/tezos-event-logging-test-helpers.opam b/opam/tezos-event-logging-test-helpers.opam index 0a7a21e9c7e7..87c0f7d795e5 100644 --- a/opam/tezos-event-logging-test-helpers.opam +++ b/opam/tezos-event-logging-test-helpers.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "tezos-lwt-result-stdlib" "data-encoding" { >= "0.5.3" & < "0.6" } diff --git a/opam/tezos-event-logging.opam b/opam/tezos-event-logging.opam index 9103c70f42b5..ab78e0d35a23 100644 --- a/opam/tezos-event-logging.opam +++ b/opam/tezos-event-logging.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "data-encoding" { >= "0.5.3" & < "0.6" } "tezos-error-monad" diff --git a/opam/tezos-hacl.opam b/opam/tezos-hacl.opam index 3a7c8ec10889..43f386841734 100644 --- a/opam/tezos-hacl.opam +++ b/opam/tezos-hacl.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ocaml" { >= "4.08" } "hacl-star" { >= "0.4.2" & < "0.5" } "hacl-star-raw" diff --git a/opam/tezos-injector-013-PtJakart.opam b/opam/tezos-injector-013-PtJakart.opam index 2a9d0e84a0eb..f766334175f9 100644 --- a/opam/tezos-injector-013-PtJakart.opam +++ b/opam/tezos-injector-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "tezos-base" "tezos-crypto" diff --git a/opam/tezos-injector-alpha.opam b/opam/tezos-injector-alpha.opam index 0e6b2a063459..59f00285703f 100644 --- a/opam/tezos-injector-alpha.opam +++ b/opam/tezos-injector-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "tezos-base" "tezos-crypto" diff --git a/opam/tezos-lwt-result-stdlib.opam b/opam/tezos-lwt-result-stdlib.opam index 1d36be179cda..514b342b0158 100644 --- a/opam/tezos-lwt-result-stdlib.opam +++ b/opam/tezos-lwt-result-stdlib.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ocaml" { >= "4.12" } "lwt" { >= "5.4.0" } "alcotest-lwt" { with-test & >= "1.5.0" } diff --git a/opam/tezos-micheline-rewriting.opam b/opam/tezos-micheline-rewriting.opam index 905e645004d3..a3fb8a40a22f 100644 --- a/opam/tezos-micheline-rewriting.opam +++ b/opam/tezos-micheline-rewriting.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "zarith" { >= "1.12" & < "1.13" } "zarith_stubs_js" "tezos-stdlib" diff --git a/opam/tezos-micheline.opam b/opam/tezos-micheline.opam index 626e3f3678ee..967d626698ba 100644 --- a/opam/tezos-micheline.opam +++ b/opam/tezos-micheline.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "uutf" "zarith" { >= "1.12" & < "1.13" } diff --git a/opam/tezos-mockup-commands.opam b/opam/tezos-mockup-commands.opam index 271ed12c55c3..30eb326226b9 100644 --- a/opam/tezos-mockup-commands.opam +++ b/opam/tezos-mockup-commands.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-client-commands" "tezos-client-base" diff --git a/opam/tezos-mockup-proxy.opam b/opam/tezos-mockup-proxy.opam index 31e419ac8395..6125a1c4f409 100644 --- a/opam/tezos-mockup-proxy.opam +++ b/opam/tezos-mockup-proxy.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-client-base" "tezos-protocol-environment" diff --git a/opam/tezos-mockup-registration.opam b/opam/tezos-mockup-registration.opam index 9ffd94bb98b6..a458b68706f7 100644 --- a/opam/tezos-mockup-registration.opam +++ b/opam/tezos-mockup-registration.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-client-base" "tezos-shell-services" diff --git a/opam/tezos-mockup.opam b/opam/tezos-mockup.opam index 6098e7f1afd5..77ce3ddcf36d 100644 --- a/opam/tezos-mockup.opam +++ b/opam/tezos-mockup.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-client-base" "tezos-mockup-proxy" diff --git a/opam/tezos-node.opam b/opam/tezos-node.opam index d14ee3b6f0e7..e71475e865df 100644 --- a/opam/tezos-node.opam +++ b/opam/tezos-node.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-version" "tezos-stdlib-unix" diff --git a/opam/tezos-openapi.opam b/opam/tezos-openapi.opam index 03a1adfe29be..f56005072e34 100644 --- a/opam/tezos-openapi.opam +++ b/opam/tezos-openapi.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ezjsonm" { >= "1.1.0" } "json-data-encoding" { >= "0.11" & < "0.12" } "tezt" diff --git a/opam/tezos-p2p-services.opam b/opam/tezos-p2p-services.opam index 6fefdfffa94f..16af2ba904ae 100644 --- a/opam/tezos-p2p-services.opam +++ b/opam/tezos-p2p-services.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" ] build: [ diff --git a/opam/tezos-p2p.opam b/opam/tezos-p2p.opam index dfcba5c4ee97..3a18bcaceb14 100644 --- a/opam/tezos-p2p.opam +++ b/opam/tezos-p2p.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "lwt-watcher" { = "0.2" } "lwt-canceler" { >= "0.3" & < "0.4" } "ringo" { >= "0.9" } diff --git a/opam/tezos-polynomial.opam b/opam/tezos-polynomial.opam index bf819ebed44c..a823981d03a6 100644 --- a/opam/tezos-polynomial.opam +++ b/opam/tezos-polynomial.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "data-encoding" { >= "0.5.3" & < "0.6" } "bls12-381" { >= "3.0.0" & < "3.1.0" } ] diff --git a/opam/tezos-protocol-000-Ps9mPmXa.opam b/opam/tezos-protocol-000-Ps9mPmXa.opam index 57b89d1ec3f0..e82b6e441418 100644 --- a/opam/tezos-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-protocol-000-Ps9mPmXa.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-001-PtCJ7pwo.opam b/opam/tezos-protocol-001-PtCJ7pwo.opam index 2142fb1bb979..f2f1779f56af 100644 --- a/opam/tezos-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-protocol-001-PtCJ7pwo.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-002-PsYLVpVv.opam b/opam/tezos-protocol-002-PsYLVpVv.opam index 085d02cc3f9e..3a24c4d32e91 100644 --- a/opam/tezos-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-protocol-002-PsYLVpVv.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-003-PsddFKi3.opam b/opam/tezos-protocol-003-PsddFKi3.opam index 9bfe6ac938cb..a6504eb48c82 100644 --- a/opam/tezos-protocol-003-PsddFKi3.opam +++ b/opam/tezos-protocol-003-PsddFKi3.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-004-Pt24m4xi.opam b/opam/tezos-protocol-004-Pt24m4xi.opam index 56e1d07f3cfe..f0ea0dd31c12 100644 --- a/opam/tezos-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-protocol-004-Pt24m4xi.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-005-PsBABY5H.opam b/opam/tezos-protocol-005-PsBABY5H.opam index 56e1d07f3cfe..f0ea0dd31c12 100644 --- a/opam/tezos-protocol-005-PsBABY5H.opam +++ b/opam/tezos-protocol-005-PsBABY5H.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-005-PsBabyM1.opam b/opam/tezos-protocol-005-PsBabyM1.opam index 56e1d07f3cfe..f0ea0dd31c12 100644 --- a/opam/tezos-protocol-005-PsBabyM1.opam +++ b/opam/tezos-protocol-005-PsBabyM1.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-006-PsCARTHA.opam b/opam/tezos-protocol-006-PsCARTHA.opam index 56e1d07f3cfe..f0ea0dd31c12 100644 --- a/opam/tezos-protocol-006-PsCARTHA.opam +++ b/opam/tezos-protocol-006-PsCARTHA.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-007-PsDELPH1.opam b/opam/tezos-protocol-007-PsDELPH1.opam index 56e1d07f3cfe..f0ea0dd31c12 100644 --- a/opam/tezos-protocol-007-PsDELPH1.opam +++ b/opam/tezos-protocol-007-PsDELPH1.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-008-PtEdo2Zk.opam b/opam/tezos-protocol-008-PtEdo2Zk.opam index 56e1d07f3cfe..f0ea0dd31c12 100644 --- a/opam/tezos-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-protocol-008-PtEdo2Zk.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-008-PtEdoTez.opam b/opam/tezos-protocol-008-PtEdoTez.opam index 56e1d07f3cfe..f0ea0dd31c12 100644 --- a/opam/tezos-protocol-008-PtEdoTez.opam +++ b/opam/tezos-protocol-008-PtEdoTez.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-009-PsFLoren.opam b/opam/tezos-protocol-009-PsFLoren.opam index 56e1d07f3cfe..f0ea0dd31c12 100644 --- a/opam/tezos-protocol-009-PsFLoren.opam +++ b/opam/tezos-protocol-009-PsFLoren.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-010-PtGRANAD.opam b/opam/tezos-protocol-010-PtGRANAD.opam index 56e1d07f3cfe..f0ea0dd31c12 100644 --- a/opam/tezos-protocol-010-PtGRANAD.opam +++ b/opam/tezos-protocol-010-PtGRANAD.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-011-PtHangz2.opam b/opam/tezos-protocol-011-PtHangz2.opam index 0c1125dcd55e..a7ac2f52c9da 100644 --- a/opam/tezos-protocol-011-PtHangz2.opam +++ b/opam/tezos-protocol-011-PtHangz2.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" "tezos-base" ] diff --git a/opam/tezos-protocol-012-Psithaca-tests.opam b/opam/tezos-protocol-012-Psithaca-tests.opam index 7f87528759e8..f62ee638c59f 100644 --- a/opam/tezos-protocol-012-Psithaca-tests.opam +++ b/opam/tezos-protocol-012-Psithaca-tests.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "alcotest-lwt" { with-test & >= "1.5.0" } "tezos-base" {with-test} "tezos-protocol-012-Psithaca" {with-test} diff --git a/opam/tezos-protocol-012-Psithaca.opam b/opam/tezos-protocol-012-Psithaca.opam index 0c1125dcd55e..a7ac2f52c9da 100644 --- a/opam/tezos-protocol-012-Psithaca.opam +++ b/opam/tezos-protocol-012-Psithaca.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" "tezos-base" ] diff --git a/opam/tezos-protocol-013-PtJakart-tests.opam b/opam/tezos-protocol-013-PtJakart-tests.opam index 5d54023e0c59..258bfa157678 100644 --- a/opam/tezos-protocol-013-PtJakart-tests.opam +++ b/opam/tezos-protocol-013-PtJakart-tests.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "alcotest-lwt" { with-test & >= "1.5.0" } "tezos-base" {with-test} "tezos-protocol-013-PtJakart" {with-test} diff --git a/opam/tezos-protocol-013-PtJakart.opam b/opam/tezos-protocol-013-PtJakart.opam index 0c1125dcd55e..a7ac2f52c9da 100644 --- a/opam/tezos-protocol-013-PtJakart.opam +++ b/opam/tezos-protocol-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" "tezos-base" ] diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 3f74b1c215bc..4968c0436361 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "alcotest-lwt" { with-test & >= "1.5.0" } "tezos-base" {with-test} "tezos-protocol-alpha" {with-test} diff --git a/opam/tezos-protocol-alpha.opam b/opam/tezos-protocol-alpha.opam index 0c1125dcd55e..a7ac2f52c9da 100644 --- a/opam/tezos-protocol-alpha.opam +++ b/opam/tezos-protocol-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" "tezos-base" ] diff --git a/opam/tezos-protocol-compiler.opam b/opam/tezos-protocol-compiler.opam index eaf5b270daba..6b6962788301 100644 --- a/opam/tezos-protocol-compiler.opam +++ b/opam/tezos-protocol-compiler.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ocaml" { >= "4.14.0" & < "4.15" } "tezos-base" "tezos-protocol-environment" diff --git a/opam/tezos-protocol-demo-counter.opam b/opam/tezos-protocol-demo-counter.opam index 6269b0e8d9fa..d6516123b5b6 100644 --- a/opam/tezos-protocol-demo-counter.opam +++ b/opam/tezos-protocol-demo-counter.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-demo-noops.opam b/opam/tezos-protocol-demo-noops.opam index a0c8ab26e303..7150f4fa9a08 100644 --- a/opam/tezos-protocol-demo-noops.opam +++ b/opam/tezos-protocol-demo-noops.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-environment.opam b/opam/tezos-protocol-environment.opam index 6059dd11a944..c1fa5003255e 100644 --- a/opam/tezos-protocol-environment.opam +++ b/opam/tezos-protocol-environment.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ocaml" { >= "4.12" } "tezos-stdlib" "tezos-crypto" diff --git a/opam/tezos-protocol-genesis.opam b/opam/tezos-protocol-genesis.opam index 71fd90a1c7ef..80c396703c4c 100644 --- a/opam/tezos-protocol-genesis.opam +++ b/opam/tezos-protocol-genesis.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-protocol-environment" ] build: [ diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam index 9780f194fab3..254448fc182a 100644 --- a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam +++ b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-embedded-protocol-007-PsDELPH1" "tezos-protocol-plugin-007-PsDELPH1" diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1.opam b/opam/tezos-protocol-plugin-007-PsDELPH1.opam index 19b4f75d3ecb..5feaf3f33835 100644 --- a/opam/tezos-protocol-plugin-007-PsDELPH1.opam +++ b/opam/tezos-protocol-plugin-007-PsDELPH1.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-007-PsDELPH1" ] diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam index 4c23267c6672..14ad2cdabe9d 100644 --- a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam +++ b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-embedded-protocol-008-PtEdo2Zk" "tezos-protocol-plugin-008-PtEdo2Zk" diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam index 57b9725e312b..255c89485831 100644 --- a/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam +++ b/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-008-PtEdo2Zk" ] diff --git a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam index 33b093a005e2..4416b1e6e20d 100644 --- a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam +++ b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-embedded-protocol-009-PsFLoren" "tezos-protocol-plugin-009-PsFLoren" diff --git a/opam/tezos-protocol-plugin-009-PsFLoren.opam b/opam/tezos-protocol-plugin-009-PsFLoren.opam index b586dd81d551..bb800ae86e02 100644 --- a/opam/tezos-protocol-plugin-009-PsFLoren.opam +++ b/opam/tezos-protocol-plugin-009-PsFLoren.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-009-PsFLoren" ] diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam index 551b22670ea5..f90907b9247f 100644 --- a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam +++ b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-embedded-protocol-010-PtGRANAD" "tezos-protocol-plugin-010-PtGRANAD" diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD.opam b/opam/tezos-protocol-plugin-010-PtGRANAD.opam index fd0b2c8ba84d..acb75bb8d291 100644 --- a/opam/tezos-protocol-plugin-010-PtGRANAD.opam +++ b/opam/tezos-protocol-plugin-010-PtGRANAD.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-010-PtGRANAD" ] diff --git a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam index e68a8abaa272..79f9543fe043 100644 --- a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam +++ b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-embedded-protocol-011-PtHangz2" "tezos-protocol-plugin-011-PtHangz2" diff --git a/opam/tezos-protocol-plugin-011-PtHangz2.opam b/opam/tezos-protocol-plugin-011-PtHangz2.opam index b29f1966633d..9fc7a79b120d 100644 --- a/opam/tezos-protocol-plugin-011-PtHangz2.opam +++ b/opam/tezos-protocol-plugin-011-PtHangz2.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-011-PtHangz2" ] diff --git a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam index a10f6ef612a8..ddd5c11f1000 100644 --- a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam +++ b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-embedded-protocol-012-Psithaca" "tezos-protocol-plugin-012-Psithaca" diff --git a/opam/tezos-protocol-plugin-012-Psithaca-tests.opam b/opam/tezos-protocol-plugin-012-Psithaca-tests.opam index 205b703b3723..1c2b4f6d6598 100644 --- a/opam/tezos-protocol-plugin-012-Psithaca-tests.opam +++ b/opam/tezos-protocol-plugin-012-Psithaca-tests.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" {with-test} "tezos-base-test-helpers" {with-test} "alcotest-lwt" { with-test & >= "1.5.0" } diff --git a/opam/tezos-protocol-plugin-012-Psithaca.opam b/opam/tezos-protocol-plugin-012-Psithaca.opam index 540e39e9a6f1..982504686ce5 100644 --- a/opam/tezos-protocol-plugin-012-Psithaca.opam +++ b/opam/tezos-protocol-plugin-012-Psithaca.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-012-Psithaca" ] diff --git a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam index 056c51fe6ff8..1d9c71a6e4d2 100644 --- a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam +++ b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-embedded-protocol-013-PtJakart" "tezos-protocol-plugin-013-PtJakart" diff --git a/opam/tezos-protocol-plugin-013-PtJakart-tests.opam b/opam/tezos-protocol-plugin-013-PtJakart-tests.opam index e5aa8eeac81d..11b5a38e3de9 100644 --- a/opam/tezos-protocol-plugin-013-PtJakart-tests.opam +++ b/opam/tezos-protocol-plugin-013-PtJakart-tests.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" {with-test} "tezos-base-test-helpers" {with-test} "alcotest-lwt" { with-test & >= "1.5.0" } diff --git a/opam/tezos-protocol-plugin-013-PtJakart.opam b/opam/tezos-protocol-plugin-013-PtJakart.opam index 5cb9ee796553..7b3ed19687bb 100644 --- a/opam/tezos-protocol-plugin-013-PtJakart.opam +++ b/opam/tezos-protocol-plugin-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-013-PtJakart" ] diff --git a/opam/tezos-protocol-plugin-alpha-registerer.opam b/opam/tezos-protocol-plugin-alpha-registerer.opam index 388edd02e1fa..9683208a2d85 100644 --- a/opam/tezos-protocol-plugin-alpha-registerer.opam +++ b/opam/tezos-protocol-plugin-alpha-registerer.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-embedded-protocol-alpha" "tezos-protocol-plugin-alpha" diff --git a/opam/tezos-protocol-plugin-alpha-tests.opam b/opam/tezos-protocol-plugin-alpha-tests.opam index 91f495cf02d9..f63518cb263d 100644 --- a/opam/tezos-protocol-plugin-alpha-tests.opam +++ b/opam/tezos-protocol-plugin-alpha-tests.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" {with-test} "tezos-base-test-helpers" {with-test} "alcotest-lwt" { with-test & >= "1.5.0" } diff --git a/opam/tezos-protocol-plugin-alpha.opam b/opam/tezos-protocol-plugin-alpha.opam index 6b1eb6d74d02..ebb03f3aa42f 100644 --- a/opam/tezos-protocol-plugin-alpha.opam +++ b/opam/tezos-protocol-plugin-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-alpha" ] diff --git a/opam/tezos-protocol-updater.opam b/opam/tezos-protocol-updater.opam index f8b206f05e74..d04f39d4436b 100644 --- a/opam/tezos-protocol-updater.opam +++ b/opam/tezos-protocol-updater.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-stdlib-unix" "tezos-micheline" diff --git a/opam/tezos-proxy-server-config.opam b/opam/tezos-proxy-server-config.opam index 184f63d4a589..51406e65fbe0 100644 --- a/opam/tezos-proxy-server-config.opam +++ b/opam/tezos-proxy-server-config.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-stdlib-unix" "tezos-test-helpers" {with-test} diff --git a/opam/tezos-proxy-server.opam b/opam/tezos-proxy-server.opam index 1a1e441227f3..73c3565f037f 100644 --- a/opam/tezos-proxy-server.opam +++ b/opam/tezos-proxy-server.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-stdlib-unix" "cmdliner" { >= "1.1.0" } diff --git a/opam/tezos-proxy.opam b/opam/tezos-proxy.opam index c9eee91a6578..64ec4c7f3ccc 100644 --- a/opam/tezos-proxy.opam +++ b/opam/tezos-proxy.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ringo-lwt" { >= "0.9" } "tezos-base" "tezos-clic" diff --git a/opam/tezos-requester.opam b/opam/tezos-requester.opam index 1fbd313affd1..dc3853166df2 100644 --- a/opam/tezos-requester.opam +++ b/opam/tezos-requester.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-stdlib-unix" "lwt-watcher" { = "0.2" } diff --git a/opam/tezos-rpc-http-client-unix.opam b/opam/tezos-rpc-http-client-unix.opam index 4323f8beb0bd..e7932eb39fb1 100644 --- a/opam/tezos-rpc-http-client-unix.opam +++ b/opam/tezos-rpc-http-client-unix.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib-unix" "tezos-base" "cohttp-lwt-unix" { >= "2.2.0" } diff --git a/opam/tezos-rpc-http-client.opam b/opam/tezos-rpc-http-client.opam index 765fb64592b7..d0f5ca9df08e 100644 --- a/opam/tezos-rpc-http-client.opam +++ b/opam/tezos-rpc-http-client.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "resto-cohttp-client" { >= "0.6" & < "0.7" } "tezos-rpc-http" diff --git a/opam/tezos-rpc-http-server.opam b/opam/tezos-rpc-http-server.opam index e50afbfb0522..512ad5f76c2f 100644 --- a/opam/tezos-rpc-http-server.opam +++ b/opam/tezos-rpc-http-server.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-stdlib-unix" "resto-cohttp-server" { >= "0.6" & < "0.7" } diff --git a/opam/tezos-rpc-http.opam b/opam/tezos-rpc-http.opam index cb23ffbe9e48..4f2ccfbbe945 100644 --- a/opam/tezos-rpc-http.opam +++ b/opam/tezos-rpc-http.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "resto-cohttp" { >= "0.6" & < "0.7" } ] diff --git a/opam/tezos-rpc.opam b/opam/tezos-rpc.opam index 1123fee2589b..c90311d79530 100644 --- a/opam/tezos-rpc.opam +++ b/opam/tezos-rpc.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "data-encoding" { >= "0.5.3" & < "0.6" } "tezos-error-monad" "resto" { >= "0.6" & < "0.7" } diff --git a/opam/tezos-sapling.opam b/opam/tezos-sapling.opam index 7ab03516d4bd..18cb46a5f6d5 100644 --- a/opam/tezos-sapling.opam +++ b/opam/tezos-sapling.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "conf-rust" "integers" "integers_stubs_js" diff --git a/opam/tezos-sc-rollup-013-PtJakart.opam b/opam/tezos-sc-rollup-013-PtJakart.opam index 55b58df615b6..df69cf474675 100644 --- a/opam/tezos-sc-rollup-013-PtJakart.opam +++ b/opam/tezos-sc-rollup-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "tezos-base" "tezos-protocol-013-PtJakart" diff --git a/opam/tezos-sc-rollup-alpha.opam b/opam/tezos-sc-rollup-alpha.opam index e64aa62932fe..d68740ea2f64 100644 --- a/opam/tezos-sc-rollup-alpha.opam +++ b/opam/tezos-sc-rollup-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "tezos-base" "tezos-protocol-alpha" diff --git a/opam/tezos-sc-rollup-client-013-PtJakart.opam b/opam/tezos-sc-rollup-client-013-PtJakart.opam index 7ab3289d2d4e..f9f725bfd513 100644 --- a/opam/tezos-sc-rollup-client-013-PtJakart.opam +++ b/opam/tezos-sc-rollup-client-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-client-base" "tezos-client-013-PtJakart" diff --git a/opam/tezos-sc-rollup-client-alpha.opam b/opam/tezos-sc-rollup-client-alpha.opam index e51d54cd6408..09a671f9af01 100644 --- a/opam/tezos-sc-rollup-client-alpha.opam +++ b/opam/tezos-sc-rollup-client-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-client-base" "tezos-client-alpha" diff --git a/opam/tezos-sc-rollup-node-013-PtJakart.opam b/opam/tezos-sc-rollup-node-013-PtJakart.opam index c37a4b1b5865..c42e1494b462 100644 --- a/opam/tezos-sc-rollup-node-013-PtJakart.opam +++ b/opam/tezos-sc-rollup-node-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-client-commands" "tezos-stdlib-unix" diff --git a/opam/tezos-sc-rollup-node-alpha.opam b/opam/tezos-sc-rollup-node-alpha.opam index 212e176d3ed9..3334adcfde1a 100644 --- a/opam/tezos-sc-rollup-node-alpha.opam +++ b/opam/tezos-sc-rollup-node-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-client-commands" "tezos-stdlib-unix" diff --git a/opam/tezos-scoru-wasm.opam b/opam/tezos-scoru-wasm.opam index 47abd0ddef46..b431ee62ebb5 100644 --- a/opam/tezos-scoru-wasm.opam +++ b/opam/tezos-scoru-wasm.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-webassembly-interpreter" ] build: [ diff --git a/opam/tezos-shell-benchmarks.opam b/opam/tezos-shell-benchmarks.opam index 4f69c77fa882..908b8212ebaa 100644 --- a/opam/tezos-shell-benchmarks.opam +++ b/opam/tezos-shell-benchmarks.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-stdlib" "tezos-base" "tezos-error-monad" diff --git a/opam/tezos-shell-context-test.opam b/opam/tezos-shell-context-test.opam index ca589af1760b..cc1dbcc277d5 100644 --- a/opam/tezos-shell-context-test.opam +++ b/opam/tezos-shell-context-test.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-shell-context" {with-test} "alcotest-lwt" { with-test & >= "1.5.0" } "tezos-test-helpers" {with-test} diff --git a/opam/tezos-shell-context.opam b/opam/tezos-shell-context.opam index cb9f048e4c09..f94be925e972 100644 --- a/opam/tezos-shell-context.opam +++ b/opam/tezos-shell-context.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-environment" "tezos-context" diff --git a/opam/tezos-shell-services-test-helpers.opam b/opam/tezos-shell-services-test-helpers.opam index 6f7ff8f0ebab..cf4d317dfcc5 100644 --- a/opam/tezos-shell-services-test-helpers.opam +++ b/opam/tezos-shell-services-test-helpers.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-shell-services" "tezos-test-helpers" diff --git a/opam/tezos-shell-services.opam b/opam/tezos-shell-services.opam index f5692d41179d..91dc3bb3707c 100644 --- a/opam/tezos-shell-services.opam +++ b/opam/tezos-shell-services.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-p2p-services" "tezos-version" diff --git a/opam/tezos-shell.opam b/opam/tezos-shell.opam index 840ff9caa361..aa4a1eb57baf 100644 --- a/opam/tezos-shell.opam +++ b/opam/tezos-shell.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "lwt-watcher" { = "0.2" } "lwt-canceler" { >= "0.3" & < "0.4" } "prometheus" diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam index 7dc01e054eea..ab8ae1db7fe6 100644 --- a/opam/tezos-signer-backends.opam +++ b/opam/tezos-signer-backends.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-stdlib" "tezos-client-base" diff --git a/opam/tezos-signer-services.opam b/opam/tezos-signer-services.opam index 89ec6b160f97..03e27b42b9c6 100644 --- a/opam/tezos-signer-services.opam +++ b/opam/tezos-signer-services.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-rpc" "tezos-client-base" diff --git a/opam/tezos-signer.opam b/opam/tezos-signer.opam index 0b6c9d0e9187..71e97a48df5d 100644 --- a/opam/tezos-signer.opam +++ b/opam/tezos-signer.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-client-base" "tezos-client-base-unix" diff --git a/opam/tezos-snoop.opam b/opam/tezos-snoop.opam index 652be2d1e478..147a900e8cd3 100644 --- a/opam/tezos-snoop.opam +++ b/opam/tezos-snoop.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-stdlib-unix" "tezos-clic" diff --git a/opam/tezos-stdlib-unix.opam b/opam/tezos-stdlib-unix.opam index 06df884d86e4..d0d41a518139 100644 --- a/opam/tezos-stdlib-unix.opam +++ b/opam/tezos-stdlib-unix.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "base-unix" "tezos-error-monad" "tezos-lwt-result-stdlib" diff --git a/opam/tezos-stdlib.opam b/opam/tezos-stdlib.opam index 22a97d3a392c..1f5f80b6f4f9 100644 --- a/opam/tezos-stdlib.opam +++ b/opam/tezos-stdlib.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ocaml" { >= "4.08" } "ppx_inline_test" "hex" { >= "1.3.0" } diff --git a/opam/tezos-store.opam b/opam/tezos-store.opam index 6dd6390f1342..c9ff35350469 100644 --- a/opam/tezos-store.opam +++ b/opam/tezos-store.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-shell-services" "tezos-base" "tezos-version" diff --git a/opam/tezos-test-helpers-extra.opam b/opam/tezos-test-helpers-extra.opam index fa64f751bcd2..9eed1c0d0248 100644 --- a/opam/tezos-test-helpers-extra.opam +++ b/opam/tezos-test-helpers-extra.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ocaml" { >= "4.08" } "tezos-base" "tezos-crypto" diff --git a/opam/tezos-test-helpers.opam b/opam/tezos-test-helpers.opam index e424a6b7e514..1c7a0defa52b 100644 --- a/opam/tezos-test-helpers.opam +++ b/opam/tezos-test-helpers.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ocaml" { >= "4.08" } "uri" "fmt" { >= "0.8.7" } diff --git a/opam/tezos-tooling.opam b/opam/tezos-tooling.opam index 3e84e6c34972..0129576003fc 100644 --- a/opam/tezos-tooling.opam +++ b/opam/tezos-tooling.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "bisect_ppx" { >= "2.7.0" } "ocamlformat" { = "0.21.0" } "ometrics" { >= "0.2.1" } diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam index a16454e30fba..4eb015303b82 100644 --- a/opam/tezos-tps-evaluation.opam +++ b/opam/tezos-tps-evaluation.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "caqti" "caqti-driver-postgresql" diff --git a/opam/tezos-tx-rollup-013-PtJakart.opam b/opam/tezos-tx-rollup-013-PtJakart.opam index c184afbcc018..172329491797 100644 --- a/opam/tezos-tx-rollup-013-PtJakart.opam +++ b/opam/tezos-tx-rollup-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "index" { >= "1.6.0" & < "1.7.0" } "tezos-base" diff --git a/opam/tezos-tx-rollup-alpha.opam b/opam/tezos-tx-rollup-alpha.opam index 0b55b2b8b644..c47218cf99c1 100644 --- a/opam/tezos-tx-rollup-alpha.opam +++ b/opam/tezos-tx-rollup-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_inline_test" "index" { >= "1.6.0" & < "1.7.0" } "tezos-base" diff --git a/opam/tezos-tx-rollup-client-013-PtJakart.opam b/opam/tezos-tx-rollup-client-013-PtJakart.opam index 69e451f9e205..6a4adab26802 100644 --- a/opam/tezos-tx-rollup-client-013-PtJakart.opam +++ b/opam/tezos-tx-rollup-client-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" diff --git a/opam/tezos-tx-rollup-client-alpha.opam b/opam/tezos-tx-rollup-client-alpha.opam index 29c9b612159c..9724ac24ba98 100644 --- a/opam/tezos-tx-rollup-client-alpha.opam +++ b/opam/tezos-tx-rollup-client-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-alpha" "tezos-client-alpha" diff --git a/opam/tezos-tx-rollup-node-013-PtJakart.opam b/opam/tezos-tx-rollup-node-013-PtJakart.opam index 1f2e1ce7006f..1c913348e6f6 100644 --- a/opam/tezos-tx-rollup-node-013-PtJakart.opam +++ b/opam/tezos-tx-rollup-node-013-PtJakart.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" diff --git a/opam/tezos-tx-rollup-node-alpha.opam b/opam/tezos-tx-rollup-node-alpha.opam index 31439a83cc1e..4fdae6e3d18f 100644 --- a/opam/tezos-tx-rollup-node-alpha.opam +++ b/opam/tezos-tx-rollup-node-alpha.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-protocol-alpha" "tezos-client-alpha" diff --git a/opam/tezos-validation.opam b/opam/tezos-validation.opam index ddc5db388f1c..c3e6c9aed1f8 100644 --- a/opam/tezos-validation.opam +++ b/opam/tezos-validation.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-context" "tezos-shell-context" diff --git a/opam/tezos-validator.opam b/opam/tezos-validator.opam index c08bce43e6a1..7510548677e6 100644 --- a/opam/tezos-validator.opam +++ b/opam/tezos-validator.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-context" "tezos-stdlib-unix" diff --git a/opam/tezos-version.opam b/opam/tezos-version.opam index 643ad00b3ca8..c2de963b50a2 100644 --- a/opam/tezos-version.opam +++ b/opam/tezos-version.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ppx_deriving" "tezos-base" "dune-configurator" diff --git a/opam/tezos-webassembly-interpreter.opam b/opam/tezos-webassembly-interpreter.opam index 493def6638c9..dfece55bb268 100644 --- a/opam/tezos-webassembly-interpreter.opam +++ b/opam/tezos-webassembly-interpreter.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "Apache License 2.0" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } ] build: [ ["rm" "-r" "vendors"] diff --git a/opam/tezos-workers.opam b/opam/tezos-workers.opam index 3aac837ba70a..07bc821349b8 100644 --- a/opam/tezos-workers.opam +++ b/opam/tezos-workers.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezos-base" "tezos-stdlib-unix" "ringo" { >= "0.9" } diff --git a/opam/tezt-performance-regression.opam b/opam/tezt-performance-regression.opam index 6a0819e1b895..d69dd6c2951c 100644 --- a/opam/tezt-performance-regression.opam +++ b/opam/tezt-performance-regression.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezt" "uri" "cohttp-lwt-unix" { >= "2.2.0" } diff --git a/opam/tezt-self-tests.opam b/opam/tezt-self-tests.opam index f753e2c1c305..37b78d6188c1 100644 --- a/opam/tezt-self-tests.opam +++ b/opam/tezt-self-tests.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezt" "tezt-tezos" ] diff --git a/opam/tezt-tezos.opam b/opam/tezt-tezos.opam index a97b4002359f..5b915b49fa7f 100644 --- a/opam/tezt-tezos.opam +++ b/opam/tezt-tezos.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "tezt" "tezt-performance-regression" "uri" diff --git a/opam/tezt.opam b/opam/tezt.opam index d8e2a9d93d76..a098c5460ae0 100644 --- a/opam/tezt.opam +++ b/opam/tezt.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "2.9" & < "3.0" } + "dune" { >= "3.0" } "ocaml" { >= "4.12" } "re" { >= "1.7.2" } "lwt" { >= "5.4.0" } -- GitLab From ed50fbe79452825c82654df0c8fd72e51b413304 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Wed, 11 May 2022 00:55:04 +0200 Subject: [PATCH 2/9] Everywhere: upgrade lang dune --- dune-project | 2 +- dune-workspace | 2 +- manifest/manifest.ml | 2 +- src/lib_time_measurement/dune-project | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dune-project b/dune-project index 6e3d44e063a5..5ea481efc86f 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,4 @@ -(lang dune 2.9) +(lang dune 3.0) (formatting (enabled_for ocaml)) (cram enable) (package (name internal-devtools)) diff --git a/dune-workspace b/dune-workspace index 95b15f035fd2..ae73d28eaf4e 100644 --- a/dune-workspace +++ b/dune-workspace @@ -1,4 +1,4 @@ -(lang dune 2.9) +(lang dune 3.0) (env (release (ocamlopt_flags (:standard -O3))) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index 52b15797c6c6..73ff76fd5e07 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -2075,7 +2075,7 @@ let generate_opam_files_for_release packages_dir release = (* Bumping the dune lang version can result in different dune stanza semantic and could require changes to the generation logic. *) -let dune_lang_version = "2.9" +let dune_lang_version = "3.0" let generate_dune_project_files () = let t = Hashtbl.create 17 in diff --git a/src/lib_time_measurement/dune-project b/src/lib_time_measurement/dune-project index b78aa572aaae..6397b5b7d91d 100644 --- a/src/lib_time_measurement/dune-project +++ b/src/lib_time_measurement/dune-project @@ -1,4 +1,4 @@ -(lang dune 2.9) +(lang dune 3.0) (formatting (enabled_for ocaml)) (name tezos-time-measurement) -- GitLab From f348f67a0009678052dd21f5f6d2e7478724fb59 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Wed, 11 May 2022 01:08:04 +0200 Subject: [PATCH 3/9] Javascript: cleanup test infrastructure --- Makefile | 1 - docs/developer/javascript.rst | 25 +---- dune-workspace | 9 +- manifest/main.ml | 15 +-- manifest/manifest.ml | 12 +-- opam/tezos-tooling.opam | 1 - src/lib_micheline/dune | 2 +- src/lib_stdlib/dune | 2 +- src/tooling/dune | 7 -- src/tooling/run_js_inline_tests.ml | 166 ----------------------------- 10 files changed, 17 insertions(+), 223 deletions(-) delete mode 100644 src/tooling/run_js_inline_tests.ml diff --git a/Makefile b/Makefile index ee0a26f47e12..046bb051e9f2 100644 --- a/Makefile +++ b/Makefile @@ -194,7 +194,6 @@ test-flextesa: .PHONY: test-js test-js: @ALCOTEST_VERBOSE=yes dune build @runtest_js - @dune exec ./src/tooling/run_js_inline_tests.exe .PHONY: build-tezt build-tezt: diff --git a/docs/developer/javascript.rst b/docs/developer/javascript.rst index adb669c1ed91..eee709db45bd 100644 --- a/docs/developer/javascript.rst +++ b/docs/developer/javascript.rst @@ -46,29 +46,12 @@ using another methods, make sure to call ``npm install`` to intall theses dependencies. -Limitation with inline_tests ----------------------------- - -``Inline_tests`` (e.g. ``ppx_inline_test``) are compatible with -``js_of_ocaml``, but we currently can't configure the alias under which -they run. - -Because we don't want to force a ``nodejs`` dependency on everybody, we -can't have JavaScript test run under the ``runtest`` alias by default. - -To workaround this limitation, running -``dune exec ./src/tooling/run_js_inline_tests.exe`` will temporarily -patch dune files and run ``dune runtest`` for you. - Running tests ------------- One can run JavaScript tests with ``make test-js`` in the project root or directly using dune with ``dune builld @SOME-PATH/runtest_js``. -In addition, to run inline_tests, execute -``dune exec ./src/tooling/run_js_inline_tests.exe`` or -``dune exec ./src/tooling/run_js_inline_tests.exe SOME_PATH``. Adding tests ------------ @@ -97,20 +80,18 @@ alcotest tests in JavaScript: Inline tests ~~~~~~~~~~~~ -Inline tests (e.g. ``ppx_inline_test``) are compatible with jsoo but do -not run by default (see limitation above). +Inline tests (e.g. ``ppx_inline_test``) are compatible with jsoo. In order to run inline_tests in javascript: -- make sure to have both ``(js_of_ocaml)`` and ``(inline_tests)`` in your library stanza. -- run ``dune exec ./src/tooling/run_js_inline_tests.exe`` +- make sure to have ``(inline_tests (modes js))`` in your library stanza. :: (library (name mylib) (js_of_ocaml) - (inline_tests) + (inline_tests (modes native js)) ) JavaScript test failures diff --git a/dune-workspace b/dune-workspace index ae73d28eaf4e..98501a26f5cd 100644 --- a/dune-workspace +++ b/dune-workspace @@ -1,8 +1,13 @@ (lang dune 3.0) (env - (release (ocamlopt_flags (:standard -O3))) - (static (ocamlopt_flags (:standard -O3)))) + (_ (js_of_ocaml (runtest_alias runtest_js))) + (release + (js_of_ocaml (runtest_alias runtest_js)) + (ocamlopt_flags (:standard -O3))) + (static + (js_of_ocaml (runtest_alias runtest_js)) + (ocamlopt_flags (:standard -O3)))) (context (default (paths (ORIGINAL_PATH :standard)))) diff --git a/manifest/main.ml b/manifest/main.ml index f43dfd61342b..7a0a8c9de674 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -206,8 +206,6 @@ let ocplib_ocamlres = let ometrics = opam_only "ometrics" V.(at_least "0.2.1") -let parsexp = external_lib ~js_compatible:true "parsexp" V.True - let ppx_inline_test = inline_tests_backend (external_lib "ppx_inline_test" V.True) @@ -1224,15 +1222,6 @@ let _tezos_tooling = external_lib "ppx_blob" V.True; ] -let _tezos_tooling_js_inline_tests = - test - "run_js_inline_tests" - ~runtest:false - ~path:"src/tooling" - ~opam:"tezos-tooling" - ~modules:["run_js_inline_tests"] - ~deps:[parsexp; unix] - let _tezos_tooling_opam_file_format = private_lib "opam_file_format" @@ -4899,6 +4888,10 @@ let () = Env.empty |> Env.add p_static ~key:"ocamlopt_flags" Dune.[S ":standard"; S "-O3"] |> Env.add p_release ~key:"ocamlopt_flags" Dune.[S ":standard"; S "-O3"] + |> Env.add + Env.Any + ~key:"js_of_ocaml" + Dune.[S "runtest_alias"; S "runtest_js"] in let dune = Dune. diff --git a/manifest/manifest.ml b/manifest/manifest.ml index 73ff76fd5e07..947d39e668f4 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -243,17 +243,7 @@ module Dune = struct S "inline_tests"; [S "flags"; S "-verbose"]; S "modes" - :: of_list - (List.map - (function - | JS -> - (* We don't run inline_tests in JS by default because of the issue #1947. - In short, we don't want [dune runtest] to depend on node. - Remove this code after we switch to dune.3.0 - and address https://gitlab.com/tezos/tezos/-/issues/1947 *) - E - | mode -> S (string_of_mode mode)) - modes); + :: of_list (List.map (fun mode -> S (string_of_mode mode)) modes); ] else E); (match preprocess with diff --git a/opam/tezos-tooling.opam b/opam/tezos-tooling.opam index 0129576003fc..3c13f54ac239 100644 --- a/opam/tezos-tooling.opam +++ b/opam/tezos-tooling.opam @@ -13,7 +13,6 @@ depends: [ "ocamlformat" { = "0.21.0" } "ometrics" { >= "0.2.1" } "ppx_blob" - "parsexp" {with-test} "base-unix" ] build: [ diff --git a/src/lib_micheline/dune b/src/lib_micheline/dune index 9f700f7aae36..e8015d81c404 100644 --- a/src/lib_micheline/dune +++ b/src/lib_micheline/dune @@ -12,7 +12,7 @@ tezos-stdlib tezos-error-monad data-encoding) - (inline_tests (flags -verbose) (modes native)) + (inline_tests (flags -verbose) (modes native js)) (preprocess (pps ppx_inline_test)) (js_of_ocaml) (flags diff --git a/src/lib_stdlib/dune b/src/lib_stdlib/dune index f342b23d41bb..ed22d3cdce30 100644 --- a/src/lib_stdlib/dune +++ b/src/lib_stdlib/dune @@ -11,6 +11,6 @@ zarith_stubs_js lwt ringo) - (inline_tests (flags -verbose) (modes native)) + (inline_tests (flags -verbose) (modes native js)) (preprocess (pps ppx_inline_test)) (js_of_ocaml)) diff --git a/src/tooling/dune b/src/tooling/dune index b24dc2822b1b..d0feeb5614ef 100644 --- a/src/tooling/dune +++ b/src/tooling/dune @@ -7,13 +7,6 @@ (instrumentation (backend bisect_ppx)) (modules)) -(executable - (name run_js_inline_tests) - (libraries - parsexp - unix) - (modules run_js_inline_tests)) - (executable (name node_wrapper) (libraries diff --git a/src/tooling/run_js_inline_tests.ml b/src/tooling/run_js_inline_tests.ml deleted file mode 100644 index feecd74211fe..000000000000 --- a/src/tooling/run_js_inline_tests.ml +++ /dev/null @@ -1,166 +0,0 @@ -module Sexp = Sexplib0.Sexp - -let () = Sys.catch_break true - -let read_file file = - let ic = open_in_bin file in - let len = in_channel_length ic in - let content = really_input_string ic len in - close_in ic ; - content - -let write_file file ~content = - let oc = open_out_bin file in - output_string oc content ; - close_out oc - -let rec find_dune_files root acc = - let dune = Filename.concat root "dune" in - let acc = - try if Sys.file_exists dune then dune :: acc else acc with _ -> acc - in - let files = Array.to_list (Sys.readdir root) in - List.fold_left - (fun acc file -> - match file.[0] with - | '.' | '_' -> acc - | _ -> ( - let fullname = Filename.concat root file in - try - if Sys.is_directory fullname then find_dune_files fullname acc - else acc - with _ -> acc)) - acc - files - -let parse_file file = Parsexp.Many.parse_string_exn (read_file file) - -let has_inline_tests fields = - List.exists - (function Sexp.List (Sexp.Atom "inline_tests" :: _) -> true | _ -> false) - fields - -let has_jsoo fields = - List.exists - (function Sexp.List (Sexp.Atom "js_of_ocaml" :: _) -> true | _ -> false) - fields - -let add_inline_tests_mode_js fields = - List.map - (function - | Sexp.List (Sexp.Atom "inline_tests" :: p) -> - Sexp.List - (Sexp.Atom "inline_tests" - :: Sexp.List [Sexp.Atom "modes"; Sexp.Atom "js"] - :: List.filter - (function - | Sexp.List (Sexp.Atom "modes" :: _) -> false | _ -> true) - p) - | x -> x) - fields - -let patch_inline_tests_for_js (l : Sexp.t list) : Sexp.t list option = - let found = ref false in - let l = - List.map - (function - | Sexp.List (Sexp.Atom "library" :: fields) as x -> - if has_inline_tests fields && has_jsoo fields then ( - found := true ; - Sexp.List (Sexp.Atom "library" :: add_inline_tests_mode_js fields)) - else x - | x -> x) - l - in - if !found then Some l else None - -let restore l = - Printf.printf "\n" ; - List.iter - (fun (f, _, content) -> - Printf.printf "Restoring dune file: %s\n%!" f ; - write_file f ~content) - l - -let usage () = Printf.printf "%s [PATH1 [PATH2]]\n" Sys.executable_name - -let () = - let args = - match Array.to_list Sys.argv with [] | [_] -> ["./"] | _ :: l -> l - in - List.iter - (function - | "-help" | "--help" | "" -> - usage () ; - exit 0 - | x when x.[0] = '-' -> - usage () ; - exit 1 - | _ -> ()) - args ; - Printf.printf "Collect dune files\n" ; - let files = List.fold_left (fun acc x -> find_dune_files x acc) [] args in - let files = List.sort_uniq compare files in - let files = - List.filter_map - (fun filename -> - try - let dune = parse_file filename in - match patch_inline_tests_for_js dune with - | None -> None - | Some dune -> Some (filename, dune) - with _ -> - Printf.printf "Failed to parse %s, ignoring\n" filename ; - None) - files - in - (match files with - | [] -> - Printf.printf "nothing to run, exiting !\n" ; - exit 0 - | _ -> ()) ; - let files_with_backup = - List.map - (fun (filename, dune_patched) -> - (filename, dune_patched, read_file filename)) - files - in - at_exit (fun () -> restore files_with_backup) ; - List.iter - (fun (filename, dune_patched, backup) -> - let content = - String.concat "\n" (List.map Sexp.to_string_hum dune_patched) - in - let commented_backup = - String.split_on_char '\n' backup - |> List.map (fun x -> ";; " ^ x) - |> String.concat "\n" - in - let content = - Printf.sprintf - ";; TODO: REVERT CHANGES TO THIS FILE BEFORE COMMITING\n\ - ;; This dune file was temporarily modified by %s\n\ - ;; and will be restored once tests are done running.\n\n\ - %s\n\n\ - %s\n" - Sys.executable_name - content - commented_backup - in - Printf.printf "Patching %s\n%!" filename ; - write_file filename ~content) - files_with_backup ; - let cmd = - "dune build " - ^ String.concat - " " - (List.map - (fun (f, _) -> Printf.sprintf "@@%s/runtest" (Filename.dirname f)) - files) - in - Printf.printf "About to run: %s\n\n%!" cmd ; - flush_all () ; - match Unix.system cmd with - | WEXITED x -> exit x - | WSIGNALED _ -> exit 1 - | WSTOPPED _ -> exit 1 -- GitLab From c37a73f8620cacc13830b4cf96a080195b123194 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Sat, 14 May 2022 08:58:23 +0200 Subject: [PATCH 4/9] Dune: add allow_empty to dune-project for packages without public targets --- dune-project | 16 ++++++++-------- manifest/manifest.ml | 15 +++++++++++++-- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dune-project b/dune-project index 5ea481efc86f..aeb661f3e2aa 100644 --- a/dune-project +++ b/dune-project @@ -24,7 +24,7 @@ (package (name tezos-benchmark-013-PtJakart)) (package (name tezos-benchmark-alpha)) (package (name tezos-benchmark-examples)) -(package (name tezos-benchmark-tests)) +(package (name tezos-benchmark-tests)(allow_empty)) (package (name tezos-benchmark-type-inference-012-Psithaca)) (package (name tezos-benchmark-type-inference-013-PtJakart)) (package (name tezos-benchmark-type-inference-alpha)) @@ -109,11 +109,11 @@ (package (name tezos-protocol-010-PtGRANAD)) (package (name tezos-protocol-011-PtHangz2)) (package (name tezos-protocol-012-Psithaca)) -(package (name tezos-protocol-012-Psithaca-tests)) +(package (name tezos-protocol-012-Psithaca-tests)(allow_empty)) (package (name tezos-protocol-013-PtJakart)) -(package (name tezos-protocol-013-PtJakart-tests)) +(package (name tezos-protocol-013-PtJakart-tests)(allow_empty)) (package (name tezos-protocol-alpha)) -(package (name tezos-protocol-alpha-tests)) +(package (name tezos-protocol-alpha-tests)(allow_empty)) (package (name tezos-protocol-compiler)) (package (name tezos-protocol-demo-counter)) (package (name tezos-protocol-demo-noops)) @@ -131,13 +131,13 @@ (package (name tezos-protocol-plugin-011-PtHangz2-registerer)) (package (name tezos-protocol-plugin-012-Psithaca)) (package (name tezos-protocol-plugin-012-Psithaca-registerer)) -(package (name tezos-protocol-plugin-012-Psithaca-tests)) +(package (name tezos-protocol-plugin-012-Psithaca-tests)(allow_empty)) (package (name tezos-protocol-plugin-013-PtJakart)) (package (name tezos-protocol-plugin-013-PtJakart-registerer)) -(package (name tezos-protocol-plugin-013-PtJakart-tests)) +(package (name tezos-protocol-plugin-013-PtJakart-tests)(allow_empty)) (package (name tezos-protocol-plugin-alpha)) (package (name tezos-protocol-plugin-alpha-registerer)) -(package (name tezos-protocol-plugin-alpha-tests)) +(package (name tezos-protocol-plugin-alpha-tests)(allow_empty)) (package (name tezos-protocol-updater)) (package (name tezos-proxy)) (package (name tezos-proxy-server)) @@ -159,7 +159,7 @@ (package (name tezos-shell)) (package (name tezos-shell-benchmarks)) (package (name tezos-shell-context)) -(package (name tezos-shell-context-test)) +(package (name tezos-shell-context-test)(allow_empty)) (package (name tezos-shell-services)) (package (name tezos-shell-services-test-helpers)) (package (name tezos-signer)) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index 947d39e668f4..350b1a93f183 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -2083,8 +2083,19 @@ let generate_dune_project_files () = Format.fprintf fmt "(lang dune %s)@." dune_lang_version ; Format.fprintf fmt "(formatting (enabled_for ocaml))@." ; Format.fprintf fmt "(cram enable)@." ; - ( Target.iter_internal_by_opam @@ fun package _internals -> - Format.fprintf fmt "(package (name %s))@." package ) ; + ( Target.iter_internal_by_opam @@ fun package internals -> + let has_public_target = + List.exists + (fun (i : Target.internal) -> + match i.kind with + | Public_library _ | Public_executable _ -> true + | Private_library _ -> false + | Private_executable _ -> false + | Test_executable _ -> false) + internals + in + let allow_empty = if not has_public_target then "(allow_empty)" else "" in + Format.fprintf fmt "(package (name %s)%s)@." package allow_empty ) ; Format.fprintf fmt "; This file was automatically generated, do not edit.@." ; Format.fprintf fmt "; Edit file manifest/manifest.ml instead.@." -- GitLab From d3ce3b47e172c1c0acb8d96b14137d24a5b04d8a Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Sat, 14 May 2022 08:58:31 +0200 Subject: [PATCH 5/9] Time_measurement: promote generated opam file --- src/lib_time_measurement/tezos-time-measurement.opam | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib_time_measurement/tezos-time-measurement.opam b/src/lib_time_measurement/tezos-time-measurement.opam index 1db3391cf47c..84224a5be59b 100644 --- a/src/lib_time_measurement/tezos-time-measurement.opam +++ b/src/lib_time_measurement/tezos-time-measurement.opam @@ -7,7 +7,7 @@ license: "MIT" homepage: "https://www.tezos.com/" bug-reports: "https://gitlab.com/tezos/tezos/issues" depends: [ - "dune" {>= "2.9"} + "dune" {>= "3.0"} "ppxlib" {>= "0.22.2"} "data-encoding" {>= "0.4"} "lwt" {>= "5.4.2"} @@ -23,11 +23,9 @@ build: [ name "-j" jobs - "--promote-install-files=false" "@install" "@runtest" {with-test} "@doc" {with-doc} ] - ["dune" "install" "-p" name "--create-install-files" name] ] dev-repo: "git+https://gitlab.com/tezos/tezos.git" -- GitLab From bf050e01defff5973896313aeceea851f4168a6b Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Sun, 15 May 2022 23:44:47 +0200 Subject: [PATCH 6/9] Tezt: accept test diffs --- tezt/self_tests/test-basic.t | 2 +- tezt/self_tests/test-retry.t | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tezt/self_tests/test-basic.t b/tezt/self_tests/test-basic.t index 32921079f7cf..671505570fcf 100644 --- a/tezt/self_tests/test-basic.t +++ b/tezt/self_tests/test-basic.t @@ -4,5 +4,5 @@ Run a test that should fail: Starting test: Failing test [error] Always failing test [FAILURE] (1/1, 1 failed) Failing test - Try again with: ./main.exe --verbose --file test_retry.ml --title 'Failing test' + Try again with: _build/default/main.exe --verbose --file test_retry.ml --title 'Failing test' [1] diff --git a/tezt/self_tests/test-retry.t b/tezt/self_tests/test-retry.t index fb089cbbeea4..809f169e3f39 100644 --- a/tezt/self_tests/test-retry.t +++ b/tezt/self_tests/test-retry.t @@ -5,7 +5,7 @@ Without --retry, we fail as usual. Starting test: Fail every other run test [error] Failing test on first try [FAILURE] (2/3, 1 failed) Fail every other run test - Try again with: ./main.exe --verbose --file test_retry.ml --title 'Fail every other run test' + Try again with: _build/default/main.exe --verbose --file test_retry.ml --title 'Fail every other run test' [1] With --keep-going but without --retry, we run all tests and fail as usual. @@ -15,11 +15,11 @@ With --keep-going but without --retry, we run all tests and fail as usual. Starting test: Fail every other run test [error] Failing test on first try [FAILURE] (2/3, 1 failed) Fail every other run test - Try again with: ./main.exe --verbose --file test_retry.ml --title 'Fail every other run test' + Try again with: _build/default/main.exe --verbose --file test_retry.ml --title 'Fail every other run test' Starting test: Failing test [error] Always failing test [FAILURE] (3/3, 2 failed) Failing test - Try again with: ./main.exe --verbose --file test_retry.ml --title 'Failing test' + Try again with: _build/default/main.exe --verbose --file test_retry.ml --title 'Failing test' [1] If we set --retry, then the "fail once" test will eventually @@ -37,7 +37,7 @@ succeed. However, the "fail always" test will fail the test suite. Starting test: Failing test [error] Always failing test [FAILURE] (3/3, 1 failed) Failing test - Try again with: ./main.exe --verbose --file test_retry.ml --title 'Failing test' + Try again with: _build/default/main.exe --verbose --file test_retry.ml --title 'Failing test' [1] @@ -64,7 +64,7 @@ With --keep-going, we still fail: Starting test: Failing test [error] Always failing test [FAILURE] (3/3, 1 failed) Failing test - Try again with: ./main.exe --verbose --file test_retry.ml --title 'Failing test' + Try again with: _build/default/main.exe --verbose --file test_retry.ml --title 'Failing test' [1] Looping is handled: @@ -81,7 +81,7 @@ Looping is handled: Starting test: Failing test [error] Always failing test [FAILURE] (3/3, 1 failed) (loop 1) Failing test - Try again with: ./main.exe --verbose --file test_retry.ml --title 'Failing test' + Try again with: _build/default/main.exe --verbose --file test_retry.ml --title 'Failing test' [SUCCESS] (1/3, 1 failed) (loop 2) Success Starting test: Fail every other run test [error] Failing test on first try @@ -93,7 +93,7 @@ Looping is handled: Starting test: Failing test [error] Always failing test [FAILURE] (3/3, 2 failed) (loop 2) Failing test - Try again with: ./main.exe --verbose --file test_retry.ml --title 'Failing test' + Try again with: _build/default/main.exe --verbose --file test_retry.ml --title 'Failing test' [1] Retries work with `-j`, but we don't know the order of the output. So -- GitLab From 19c157be1c803ec6a85bdd84eee85fcd0442903a Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Mon, 30 May 2022 17:32:49 +0200 Subject: [PATCH 7/9] Opam: remove fake ppx_blob deps --- manifest/main.ml | 4 ---- opam/tezos-tooling.opam | 1 - 2 files changed, 5 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 7a0a8c9de674..710227483cfd 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -1216,10 +1216,6 @@ let _tezos_tooling = it is added to tezos/opam-repository. *) ocamlformat; ometrics; - (* Keep a fake dependency on ppx_blob so that we don't need to - do the opam-repository dance just for this. It will be - removed later when bumping opam-repository is mandatory *) - external_lib "ppx_blob" V.True; ] let _tezos_tooling_opam_file_format = diff --git a/opam/tezos-tooling.opam b/opam/tezos-tooling.opam index 3c13f54ac239..562eef4a6b7b 100644 --- a/opam/tezos-tooling.opam +++ b/opam/tezos-tooling.opam @@ -12,7 +12,6 @@ depends: [ "bisect_ppx" { >= "2.7.0" } "ocamlformat" { = "0.21.0" } "ometrics" { >= "0.2.1" } - "ppx_blob" "base-unix" ] build: [ -- GitLab From 40b778bdd71a64734264ceb16e98d638900c5bf1 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Mon, 16 May 2022 15:36:09 +0200 Subject: [PATCH 8/9] OPAM: bump refs --- .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 e35dc38bc799..ca2f77a14f30 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: d23e36e7975aa9bbebbc20044a3b47f50a64e5ea + build_deps_image_version: ccf3b8b9c2cb3843eb64e34b6d0369a65c861db6 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 8af9ae09cb66..b0f4a099dfa8 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=3dbade647e4d2d38094e43ed33626d4b5be305bb +export full_opam_repository_tag=b3e9c1daa25dc4867135bb774c32d66398de3940 ## opam_repository is an additional, tezos-specific opam repository. ## 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=d23e36e7975aa9bbebbc20044a3b47f50a64e5ea +export opam_repository_tag=ccf3b8b9c2cb3843eb64e34b6d0369a65c861db6 export opam_repository_git=$opam_repository_url.git export opam_repository=$opam_repository_git\#$opam_repository_tag -- GitLab From ea860d2116dd975e7af97a943836bd5585fad4a4 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Tue, 31 May 2022 00:14:08 +0200 Subject: [PATCH 9/9] Everywhere: fix deadcode --- src/lib_workers/test/test_workers_unit.ml | 2 +- .../lib_protocol/test/pbt/test_refutation_game.ml | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/lib_workers/test/test_workers_unit.ml b/src/lib_workers/test/test_workers_unit.ml index a2303e350158..13211b76f007 100644 --- a/src/lib_workers/test/test_workers_unit.ml +++ b/src/lib_workers/test/test_workers_unit.ml @@ -272,7 +272,7 @@ let test_cancel_worker () = (* TODO: https://gitlab.com/tezos/tezos/-/issues/3004 in follow-up MR: fix the handling of exceptions and integrate this test *) -let test_raise_exn () = +let _test_raise_exn () = let open Lwt_result_syntax in let* w = create_queue "exn_worker" in assert_status w "Running" ; diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_refutation_game.ml b/src/proto_alpha/lib_protocol/test/pbt/test_refutation_game.ml index 0fa7a2e970c6..9c67fc7a7e1c 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_refutation_game.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_refutation_game.ml @@ -36,9 +36,6 @@ open Protocol open Alpha_context open Sc_rollup open Lwt_syntax - -exception TickNotFound of Tick.t - open Lib_test.Qcheck_helpers module Sc_rollup_repr = Protocol.Sc_rollup_repr @@ -74,10 +71,6 @@ let proof_start_state proof = proof.start let proof_stop_state proof = proof.stop -let check pred = - let open Result_syntax in - if pred then return () else error () - let number_of_messages_exn n = match Number_of_messages.of_int32 n with | Some x -> x -- GitLab