diff --git a/.gitlab/ci/templates.yml b/.gitlab/ci/templates.yml index e35dc38bc7999e2791c4542a4533055caf70c126..ca2f77a14f307dd33ce26fc20b24db9f6a953b8f 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/Makefile b/Makefile index ee0a26f47e1244b5e1f2105bce081c3284bf3b35..046bb051e9f29395f1fb5077381548051dd6157d 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 adb669c1ed91ae57de3b008ad85c577943ca2e95..eee709db45bd257794068a90181fa09b8128589f 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-project b/dune-project index 6e3d44e063a58970907a6e6f904d4a0a740df652..aeb661f3e2aa001dab831cec9b6df98c8437296a 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)) @@ -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/dune-workspace b/dune-workspace index 95b15f035fd2e880ef43a0cd6c9d3558b480cdc7..98501a26f5cda4d31bc464f10e1a8970a2afbd25 100644 --- a/dune-workspace +++ b/dune-workspace @@ -1,8 +1,13 @@ -(lang dune 2.9) +(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 f43dfd61342bdbed06a14607951bc6077d8b226e..710227483cfdc9506a08a5f8ebf0ce93864bfa22 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) @@ -1218,21 +1216,8 @@ 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_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 +4884,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 da6b385bbd9bbcf57673ca85fa8f7d609b6e8782..350b1a93f183b4c5c5733c4a7908fa2222b00b59 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 @@ -1955,9 +1945,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; } @@ -2077,7 +2065,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 @@ -2095,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.@." diff --git a/opam/internal-devtools.opam b/opam/internal-devtools.opam index f9e3b304a32a466b5cd208b6132b4815782242f6..39acfabec7c2df19b9ebb316eeb5b870ad04a0c9 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 af898fbffa638a48679c678879202d10013a4c6b..431f5832c599a2c87125cd087891e33808554a34 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 cef2c5d32bc692072dba634d15ff47eed6ebe3b4..12dc6ce61da6fea48ae3159819a9b8a131c19080 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 c94b02ee6a507d535b5192aed8c42293c59dae05..cc1b488debb0bbb0c7f8e80bc364b968c2660812 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 e66e95478e2af0ff4e82ba6feb4cf4a8f7d81448..f0e541714fc301f24f8c0f513fd8df7f33c6ca1d 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 0b38accaf47c0f1892419cd55fe4f91049204f4c..b42cbd44814db5fdbba834558a5dd954166e4b16 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 bc48912ae998466f63d31dbb305c86e0dbfad130..66243e3846db36ab81b9ab607daa55bf5c17ec95 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 3b7d6338bf9e605689c5cc8368d77183bcacb8e3..7bff25343f2de1539de0a4541d292976eeac2f78 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 68bd28a4846a809914b9767a91bdfe63b340b2ad..76a9e9beea8ceb4ccba173a0145b3a1d6b96f1b5 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 74e307325eb938040f2cbf3766ae50a2e9044802..445ea5e2f2b2ddd90b4e912eb0ea4bf180067337 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 e67292a0fdc8852eabbb586b3a46d7cbdab9342f..97309b79638db202ecc9312e9376b9ea1b095cfc 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 183509f35e89dabd46e5b56b3c126134c9c2f851..c1f456994970f9bbac0defc605381106a08867f4 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 454fc0547f7e5c8328222932e3d433b61f59be25..9e0d9b72fa13342ebdcc47175baec387464cf10c 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 c5b0ae4480830cc6b06e94922583ce94568bb6bf..40f9304bae83ef610e4e06ac497d619f1ebf0e55 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 fa9bd3d9bda98fe7ff44f0b270ea5dfb0ee356b8..c25a6e31087c4ed06e68a1efb5a6e8197e8aa97b 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 f4fdb5bc1b4535d8d6ca794061b69889656e6ebd..49bf385dcfe090fe3ba525acaffa9cdb01e7e9d2 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 050ca980a93fe374ce17428ecbee1f1969a0c95e..ac6430883c96e5f020b4092a8bb1fc3a4425626f 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 f7bd9d7d9e730fc4114098a72a048635754ce861..1f9809ccb3e3b3cecc792a3c7feaef9d5f3e3312 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 22fc9be89c5f378b6afcd02ebecc8f7e07a16798..1fdd4ef74e01d1cd158dbad181ca80b4d8730817 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 bf7c9bcb6bd49befe499f6a387a4098f3f5dfbd1..b65301146d153f4ee1e30cec3da254dbda06cf55 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 5ae78dec113650d0054330c14945798fca4aad89..eb750943388951fee3f797898de57ed41649cdfa 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 bfa22d6bc193299c2d46a821dcb948a2e42cc022..5253f718f25468d459689d5b93a44bb93c161d3f 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 c9d3dd971481ff6388785632ebeaa7f5af6de4ea..759611935b18f73fa5b0d8d55fed2b94332ba4a6 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 8bb75616ff5cea0b30ba527286b6e02976946146..c6485fbc9a5cecaa943c4c85054c24ca6c16577d 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 610e0120385e152b602d5afd7da3f77a9fd02b4e..88ff358489fc0ce6ea6185c444b488e9994c4466 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 219f32ae512dbc0af953e1a93aceb7b326447956..5a9178e5abc07b0e09ca7ebda98a72f89ea213e6 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 216cc5592d664ec5225b179e6c426ba09032bb6c..33485efb7bfcadae7a99b4af39b18a2045b4ad5f 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 bcab6c35e77809e073956475a3cd9df4257bf319..907e57f78f4baddef7867cfa6846c7851e0c54c7 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 fa4d26a1872c8c5afa44e1f4cb869e498bdf45af..a85b4f0f9c75b393f85f467ac1ba13b7debb1486 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 bfb620f3d63e5f5c8809a727f751adef3693f2da..f994c9cb924586115cad7e57c927ca0d0c7cdc9b 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 e9c218350f7e4c111b1d4378cbe4979a1ef34827..a69e05f45bbf886acbdda72c63642d1cd72113ea 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 1dc32fbf62f369d50e4c9179f392b43c32b1bf27..177fe2ed48abc18c9ff0405e47b6804a456ab0cf 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 f0e7eaf2de6859748e109b5af484dd4e34c8bf39..a98874b8f9fd898a49ddcf58417f8a336ec4f18c 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 131a50351e86508704fd0b84dec90ad3ff2efd1c..564b0ff63e5334c7e5b2a19927c5a41c69bceec0 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 930be83ea84fb7209e53d705987579069766a154..ea798f74c2a80c57dfc6518393328a268cb7daae 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 76d224ea309c46e4ed78942d9774b28ea8c9e11c..bfe3c15cf2459252584ea60f218b9e7ade879e0f 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 3385331c8960fbccb3bcbefcb4e593c42e0bcc34..892db781e9f11e6205bfefff77d85323108310c8 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 d7120184325c67450b48fe309087c26550081594..69744a2de1ba6e45bf603dea661b5145fcaa4873 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 f5d8b54a986cfd0b56a184648ef45dcb77d8acc1..fcccabac450c115938d23b661dc9220b80e1dcd8 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 3d4127b917d07d9db5c3a72f0c8820e0b1f422a8..04f051a9f39de3a1e806ac886d415232fe4ba691 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 9dc8f9fbc26f06883852a70688d154f6a3216db6..50bdbf0e5f624d1b99ea59022c96988ea1582251 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 3906f4aef3dac54bbb9f62b7bffb5dc516a3b138..72c68fb7216c6f54564fd3b1b5da06b6e5d5a628 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 b12703e3f6072ea104e9fdb96c5a7335d239cf18..f79666df7294948c2c7b4d883952cb3bdc4bbbf8 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 82dd2eca483ec2ea237ab56e16932aaa593bc247..830b6e6888fe78715cef77afb3e5c1e76a7dece8 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 da5beb29f1dc51d5612b22db6b8be3384d4c037f..33a6058b3ccb51e7458ae4883ea86c7a82787263 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 ffe912cb4086f1a1bafb4265ec072c5f04b0e118..f4417bb62f55f7b6d394c112e9f898d20ac68cd3 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 8b99e04276c29c13dff11e9588f7df5b2f44e242..7cae2f4d6c5108dbb8f2204df709d1c192d94ae3 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 cba68221828213a73037c0de0b5a0cead95b4a47..0a0609b806870b20438a5a0bf114799f188cb85d 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 993f18cea56c8edd4e0bbfc031ca1ac7251980a2..be9c4fd6bab640f87798c316472419032f2bfe56 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 92d1f0bd78cc859a9805cf7edc2917e601fad79c..8dae6761e709523c4324aae0da7353d930e7c7f5 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 478dfc3a10f8feeef9d3790757e585233af43901..22376ba2f79fe6d91193ccf3d0a48328e6696904 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 837e37e241687176146cd0da1ee32a6bdf494a2e..dc07fe60fa19c8259168b8cf31a78af86af5f495 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 2ae4830ee6d3c48772c5a3fdf4ce24f728f2bc56..b2573dc541525a0f20b5f6945153256afe7173f0 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 06cf4592465120733fc7aa6c418b8470c00735ec..bd92b798b40ddd6e160d9d2db23983ab1029c37f 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 b79829907f6e9c68ce72cbe77bbadf35d1beb064..0953835f618d2b7a171e32f64cd476a44b93b325 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 fe9c237781a1f383f12844ea9e018f81a4393588..943eeb4c2bb47d68bba39359defb2f75eb2db034 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 ff6fdfdb40db792575ab97b821d5e00daa72c285..77002b49944d93e01a767e6adf9546cae67c906d 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 93999e457b1fdfe4fab9a5c5f469845aabd52667..0464faea699b96cdfc3b6a90cadf83387e60d6b6 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 0e6a3fa2f80177b11524e29905e0a07d5c17a182..26afc766626a07c8bf8910a9ddc77d323cf15485 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 f6f267cfd3cec5a19f55b635ba4f296c3d2fd4fa..740b663909967db12f3fd3066d379836f42d9600 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 ff72323df9aacf49fc9f151c90bda989476cd013..c2f4377276a60b143cc4ac1777366fea375921c7 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 0f77d45ad205533c0ceb191d17d8373d5ccee8cb..08ac74f3adaf89764de8b031ee73de8369d21772 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 655779287810bf9ce6ab1ab5598e93305382d083..7ab76999f07494ef659840bbbdcf6e77551e4b8a 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 fb5ab1a1d4eadff50fa5187d2c2cc80c6409d848..46cbd20c9850f390c7dbee418fc7162a702de833 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 8922492ffc448a917ee521d4935f0210afdfefd0..ce8c53df47c84e2e9d782f0e5565162ff09730d2 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 7bdacdde0accca20e4e210588baed5235773451d..81fab1803e3acad15efc3c986185be430082a2ec 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 7a1c5f6d759562180038aebb05925d4961902c05..77c7d10c4e8ed43b39a8dc3305623787e8c9788c 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 c6152f8ceaeee326f6b26d0762bf9d39a8d084ff..8d614feee28cf64de311ea2577f90ad34359b961 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 1572e89c126edbcefe8b1400657090e7349daad0..4e40cff123a91cc13c8ee4ea7943c00a1f8ef7f0 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 e4ec20ff191475e6dcd675c9e2a5bedbf94e72f9..da877f16bbbfd7ee51f1372d8f9f8e573a0ebf20 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 28e04a8939aa44f84a5ebbf1496e3c3d25e9f87e..2bb4a2572bae68e33b158b688c30b61f0df122b6 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 6269194e61c6bebdfe60058168f13d8067bf23ea..47c4f1fda680731001ae84bf3bef41476c3fbfd6 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 5f51d4560542e1dacf242d86ab4eab4099670db9..89b3f5a7acb2e81636656e15d280f6ae2047b2da 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 56fe1a42d3ec67f4436d9e71ff94858d96ab9fab..55550add357c35dcab8abd72c096d015c8169502 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 fa5a5fdb4cc00408b54130ba1f68317568a44698..a30c49f1ddf6430e9cd088120a47cf120b716145 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 e0a675ca4813eb0cb5072d381f8f90bffccf0140..1970de95b18afba4f2253d8ec374aa6b41a76b94 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 0a7a21e9c7e725d852e04fd61024ad2f629bba18..87c0f7d795e5566080395622cd8fa91ac95b414f 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 9103c70f42b5efd901eab5cad9511348fbece01d..ab78e0d35a235f40459bb5b5b5642c9e76b33931 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 3a7c8ec10889be5fb43060f1a4dc7b9c414222f7..43f3868417345027f359c6614af9d05a1ef618da 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 2a9d0e84a0eb318db5c984b528d89a237e80761f..f766334175f91756124c7fc293f13e9ca993e0a3 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 0e6b2a063459384ad83aff05e8b4ffcdb2d50bf3..59f00285703f916e30ecb7f51d9a24a9e41ae3e7 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 1d36be179cda0dbe451e0db6cf4dc8dd4ad8eebb..514b342b0158cdd65508e15e0fefe5728ba33cb6 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 905e645004d309e075da3f728b6f86afa523ed9d..a3fb8a40a22f1c2e499566d5afbe84a1a1b3d8d5 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 626e3f3678ee7d942c621afc9b1a67be9b64978b..967d626698baeb64c0c0e41e3c208e5e9e5acb76 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 271ed12c55c3b3187d99fbaba886d53382326f86..30eb326226b9ead26e2e751ad3565729a33cb968 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 31e419ac8395fba89294b371bdcbc7087c57f3a6..6125a1c4f409dc86de7cbd9f56b6a12296261bbb 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 9ffd94bb98b6e42b560cf7e1ba300d201ee57437..a458b68706f70a7f9d35bd56e5c77a48b1da01b1 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 6098e7f1afd536d3c95c7c10cce129fb3afe00c7..77ce3ddcf36d9a6af1a41380ba9a205043705cd3 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 d14ee3b6f0e7db9e6c78437895dc3efacd7f9e81..e71475e865df1c584b707a8ca78b052b9fa4e171 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 03a1adfe29be1e8401a5663aa65268f3a75f2744..f56005072e343be0808705a3b03ce2629d2a17f6 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 6fefdfffa94ffb4069f97fe67df1455863577a26..16af2ba904ae4777e40c0b69500ed992d4767198 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 dfcba5c4ee972e1c4836038807def6e46197527b..3a18bcaceb1413c02c71618510b177150f549b2e 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 bf819ebed44c936d1d7b29c32815f92f58667114..a823981d03a60883c10500d6d48a0e8d2423362c 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 57b89d1ec3f0a632c840feccb1600293f5d10cca..e82b6e44141836f284c7088b535073d7c5bbe422 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 2142fb1bb979a14a325dde44def29a2232ed986d..f2f1779f56af478dde3b90d2a4850c13e6444a07 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 085d02cc3f9ebbcab4dbe80ef83d888a12dcaa3c..3a24c4d32e9113352babed04fda3624589ac87a3 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 9bfe6ac938cb6ec06fcffc749cb97a24946935f8..a6504eb48c8299920fbb0e3f2592651a2afd7d0a 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 56e1d07f3cfe4bf70f5c3d5f47b81adc2c5585bf..f0ea0dd31c1204a5c7ca366b8afedf996aeb2c91 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 56e1d07f3cfe4bf70f5c3d5f47b81adc2c5585bf..f0ea0dd31c1204a5c7ca366b8afedf996aeb2c91 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 56e1d07f3cfe4bf70f5c3d5f47b81adc2c5585bf..f0ea0dd31c1204a5c7ca366b8afedf996aeb2c91 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 56e1d07f3cfe4bf70f5c3d5f47b81adc2c5585bf..f0ea0dd31c1204a5c7ca366b8afedf996aeb2c91 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 56e1d07f3cfe4bf70f5c3d5f47b81adc2c5585bf..f0ea0dd31c1204a5c7ca366b8afedf996aeb2c91 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 56e1d07f3cfe4bf70f5c3d5f47b81adc2c5585bf..f0ea0dd31c1204a5c7ca366b8afedf996aeb2c91 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 56e1d07f3cfe4bf70f5c3d5f47b81adc2c5585bf..f0ea0dd31c1204a5c7ca366b8afedf996aeb2c91 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 56e1d07f3cfe4bf70f5c3d5f47b81adc2c5585bf..f0ea0dd31c1204a5c7ca366b8afedf996aeb2c91 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 56e1d07f3cfe4bf70f5c3d5f47b81adc2c5585bf..f0ea0dd31c1204a5c7ca366b8afedf996aeb2c91 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 0c1125dcd55e19c98c29be6c397a04005f9d9f73..a7ac2f52c9da79f705540062e25e2decfc8755af 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 7f87528759e826c44db299c7b5980e5b0bba39a1..f62ee638c59f9ca28c09b0ca0f0c4722af3c0fb8 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 0c1125dcd55e19c98c29be6c397a04005f9d9f73..a7ac2f52c9da79f705540062e25e2decfc8755af 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 5d54023e0c59aba184b33667b986281487625103..258bfa1576781daf34bd99b778c4f969d937b54b 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 0c1125dcd55e19c98c29be6c397a04005f9d9f73..a7ac2f52c9da79f705540062e25e2decfc8755af 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 3f74b1c215bcb390732306ecfd84d9f0a380f197..4968c04363611d32300786294b0de30800f649ec 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 0c1125dcd55e19c98c29be6c397a04005f9d9f73..a7ac2f52c9da79f705540062e25e2decfc8755af 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 eaf5b270dabaf09e00b5eaeb9215ca5d16b45270..6b6962788301039f5dace7258d5febe18adcdb0c 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 6269b0e8d9fa6b0dbb69f8cb1a2d65c20c0f2441..d6516123b5b610b16b39e7590d55926eb38287e3 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 a0c8ab26e3030023c881ef10524c66cf82bd3601..7150f4fa9a08b9e3958df1655e22c2bd0d11c509 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 6059dd11a9449730f70a285ef8eaa74ee643f9f6..c1fa5003255e5e30c0f6ae366cd5f8506fd5b69c 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 71fd90a1c7ef45bf357301c26efedb9508350ae7..80c396703c4c341f16a8b9fe3880fcbea5599888 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 9780f194fab33b8d58a7af8b0c87f9e354053beb..254448fc182afb83173cfabde55c3572448975f6 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 19b4f75d3ecb188cec93ca7238014be1adc895a0..5feaf3f33835e49d7a0c1d7f5a3da62547459ab8 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 4c23267c6672783bd6c9e3937c1a16ce3dcc0859..14ad2cdabe9de42ea37dff1fb38042fd0512cb18 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 57b9725e312b2ab734cd90aa4a8d5716c76e9120..255c89485831c0929c92af1f0ed95cb3b40946b6 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 33b093a005e23704b6b38a353c88aa2b672629e3..4416b1e6e20d3f5e8330f2b7d55714c5fd82ce40 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 b586dd81d551023af93997b35f87486e69150451..bb800ae86e0281204ade7ee2bf59886652ae11e1 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 551b22670ea55e1941096aaaab5d50267687b64f..f90907b9247ff6f4e1aaaf6ffa1c6f5c32e7663d 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 fd0b2c8ba84d3a1ef1a9e44a0fb882225dfb3daa..acb75bb8d29144f30a44f01699d10cc2ce8e4304 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 e68a8abaa272adcdcd40e3381501046dbb4b880a..79f9543fe043c96d828c4f5797a3524b2826eb47 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 b29f1966633d04066e4f17fd2634044357aee6f3..9fc7a79b120df5a6d44e20f3a407c235a8f18f36 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 a10f6ef612a80ea8d8231a8574a9da8bc487eb56..ddd5c11f1000c5020bf38dd35899a7b00f8f5abd 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 205b703b37239c2793816ef0806caec6d40fbf09..1c2b4f6d6598fea717383e102c9c72d515db5081 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 540e39e9a6f11cfe67bdb1af56ab8e8b4dd43e5c..982504686ce53e1b30c6c97caa0ff878546d1d8c 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 056c51fe6ff8b866851121e313d768dc444d3f15..1d9c71a6e4d224caa14a2e7934cee7aa7ab8ed0a 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 e5aa8eeac81da6082f503d9ab91fc0ef9688bf1a..11b5a38e3de9fded4822f871942a3d633aa4df67 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 5cb9ee79655352ed793318a24c37aa08ff79e936..7b3ed19687bb599f095de7dc6bf1d009d5cb4659 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 388edd02e1fa62d9b0f42717dd5e770bc14f9ce1..9683208a2d85ec5a7c9e4bf1cf76d09e128c513e 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 91f495cf02d939eb71fbd140c21a271a2f86e8e7..f63518cb263d18684e26ead2b77cc5ee51db3289 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 6b1eb6d74d02f18da3c76462b4d390309ebe8023..ebb03f3aa42fed59eb1db9c110dacbdced6be0df 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 f8b206f05e744baca502901ed6970b1e589c15ec..d04f39d4436b26c39db0c34cfc4cf5178df862d2 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 184f63d4a589cbbdcb59f1da0ac677ac5e90d27f..51406e65fbe096118feb1462e7b816cdf88d523e 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 1a1e441227f332883e9400cc4337913a6d367888..73c3565f037f08049497ed14dea121daafdb0bc6 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 c9eee91a6578168927833baa82f48b298e5c8e54..64ec4c7f3ccc0d04e8462d7fd1a014e36645bd10 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 1fbd313affd15ea4d39153d71f3db67558f284e8..dc3853166df2c33dc54aa329d40902c8b3c0beed 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 4323f8beb0bd22b721896a4ebe63c69e1d70c963..e7932eb39fb1854dd1b55c54df48d217e3b70986 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 765fb64592b79d5f5d654eb88345bee166ff9663..d0f5ca9df08ee7d79a173711f97c63b1f92d458e 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 e50afbfb05225be044e5c9b1da9e60dc6c5127c2..512ad5f76c2f98d0daba25b89b29053e77fe7021 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 cb23ffbe9e48c4148dffb3763ccb02c6ac49dc1f..4f2ccfbbe945abe537c25ae7c687b9cfdfbef07e 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 1123fee2589bf2b902121f695940390be6e9dbc2..c90311d7953095113675548c4795fa2eea9cc4fd 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 7ab03516d4bd487bf6f7f738fb81f6fe0d9cbfe7..18cb46a5f6d5853a86ff676a4980c206b2f98c12 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 55b58df615b67b73e1c8a4aa36991444224a9cf0..df69cf4746751453b0566c509c1cba0b8e00f019 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 e64aa62932fe7216b096fa8e2fb7694d3ae7c02c..d68740ea2f64999ab4f7dbe0dbb4d44271197a12 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 7ab3289d2d4e7c69eca1eb0d335532c3ae86a807..f9f725bfd513eee63efb8384218a745454bf1f36 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 e51d54cd640876558605c944782bbf469b927426..09a671f9af0154fefd23d5fdf2899643b284855e 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 c37a4b1b586510040f8a5cc615474fc3ed995aba..c42e1494b46281a61a26831a76dae3b16b5dc967 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 212e176d3ed9cb6ccdc967dcb76e1db5e5518d04..3334adcfde1abe7cf3a4a338e8d51d9cb10ca232 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 47abd0ddef46072ff979814e2cf244fae070c935..b431ee62ebb5ffaaed8e9d9eefad4a18783fd644 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 4f69c77fa882beb999cb6a55b164f269c99eaa42..908b8212ebaa31677d778913776ff6b6d13d6105 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 ca589af1760bad5c13e729e9460a1315f56b84f8..cc1dbcc277d506c94e3667479558402ad01da4a9 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 cb9f048e4c09d5f3f28b58062aaaad70759db591..f94be925e972403bfe2d82cfe81587e40dee2b21 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 6f7ff8f0ebabb2cbaf2a109a985beeeb81775fd8..cf4d317dfcc503a059fd41794055fe4fc3dbd517 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 f5692d41179dcd44267968102843a94d34a55bd8..91dc3bb3707c043090a300120a32d4d5a27251cd 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 840ff9caa361dc8202c8954f0e0d6e98f12d2981..aa4a1eb57bafb32f2536b6327f1c362c6f83dafb 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 7dc01e054eea6adf1a57b422510e7ebe8a39d395..ab8ae1db7fe6f6ad1f5f88974a4885dfc092b016 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 89ec6b160f97eb6ed4d30443e086a7ff1e9bf697..03e27b42b9c678dd42902fef34cddc7f99a8bb5e 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 0b6c9d0e91874f03e1a82e8d2d2bad04d0ab4aa8..71e97a48df5d81d9f34dea298540225523648550 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 652be2d1e478d05fe3f74fc98009e9319fc3412e..147a900e8cd3490b6a26e5e308ebfb04c41ffc51 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 06df884d86e44594b23d0e62aad279c43af852e5..d0d41a51813943f8d8a3dae8e5515c8f7aa22529 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 22a97d3a392c46a9ab8038db7696bad283e3a4c5..1f5f80b6f4f96f9254d7eec1ffd7967682349dcf 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 6dd6390f1342910cc027a00fc659f05d85469c3b..c9ff35350469ef5307f1d4e83e5f7022caf77028 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 fa64f751bcd2d8046e09bb86fd9a9ce35ce35598..9eed1c0d0248d4e6367a726b442c67079eb8f67e 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 e424a6b7e5149e3b08af35f745c528090bb01718..1c7a0defa52b62042dd77eeeffed9573b6111929 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 3e84e6c349723f81b80f6773f9aaf4a00773f135..562eef4a6b7b4ac7597e88ed60127c78d2ac85dd 100644 --- a/opam/tezos-tooling.opam +++ b/opam/tezos-tooling.opam @@ -8,12 +8,10 @@ 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" } - "ppx_blob" - "parsexp" {with-test} "base-unix" ] build: [ diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam index a16454e30fba0d8809478b222c9ec52c5ed4839f..4eb015303b823407c774a6c305f6e2e3a1048b44 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 c184afbcc01837ede8c3130f45f8496631b80984..172329491797e8a9e43b001aebdffd6fb57d4166 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 0b55b2b8b64490acf9d0c607874c053015eb3277..c47218cf99c129df2e13dacb743f42888fe8c896 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 69e451f9e205b1cbbce4360bb99e0f726c249e6c..6a4adab26802baf38adce6605063e99f2d698992 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 29c9b612159cf29fbe3d63ec8416c9fa27885526..9724ac24ba982d6780c4b5119eecd250b64c5630 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 1f2e1ce7006f1a085ae4541cbd09ed58da2fd57a..1c913348e6f6a79a5060baafbfe85e5747aadf44 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 31439a83cc1e3ba7a2ff0781bf8fb9fdc736e12d..4fdae6e3d18faae7f878e7b5d543347588a68f79 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 ddc5db388f1cd1cd097fb6852915edc48074eb42..c3e6c9aed1f83d1267de6bbab4e739d3d5d58420 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 c08bce43e6a11b53efe60c8d767ede266b7ca04d..7510548677e6aa1d4ff926cd16fef970f13bdb94 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 643ad00b3ca8cf47dcf6b275ae5620d45b47d061..c2de963b50a253e9ce9b5ef5934b583da1e0ba64 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 493def6638c9b07791c5e76dad7fbf3a2273172a..dfece55bb26842f0d30ae8e19eede16e9ccc2933 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 3aac837ba70a8eecc32a095ce860a6201579c4e9..07bc821349b88b0511b0b60dbc0fb107d61fc99c 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 6a0819e1b895b9ee2167f791976e59a73d32becb..d69dd6c2951c3d9d873ee64940ed90c6cc3dcea3 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 f753e2c1c305d69667d7283c3945f50fda1740d4..37b78d6188c11b6ca279702c58b695c12be46d17 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 a97b4002359f78447ff26081a30b2388a2242f34..5b915b49fa7fa7607f9219238be977637ae1b2be 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 d8e2a9d93d761a2dbbab5ece01d53282053c9821..a098c5460ae04b4647fa7d93428c13048da64214 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" } diff --git a/scripts/version.sh b/scripts/version.sh index 8af9ae09cb661b879b46864f7724119f1e60cf77..b0f4a099dfa83c3d718c78c192cce9768e6bbd5e 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 diff --git a/src/lib_micheline/dune b/src/lib_micheline/dune index 9f700f7aae36e8bddcf73ceebedc9464f73f20f4..e8015d81c404955320f75b35b1f20c0eeff80382 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 f342b23d41bb81751a0522fc7d458e6dd6691eea..ed22d3cdce306bcd3517c5ee465742e8baf74c09 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/lib_time_measurement/dune-project b/src/lib_time_measurement/dune-project index b78aa572aaaec2e41e07a400a1fa6f3d303400d4..6397b5b7d91d99c52f8ea046634390daffacc7a6 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) diff --git a/src/lib_time_measurement/tezos-time-measurement.opam b/src/lib_time_measurement/tezos-time-measurement.opam index 1db3391cf47c586cfdf22ab427bac04f8dd9da31..84224a5be59b5b6f25e55311efd4f0edcca3964b 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" diff --git a/src/lib_workers/test/test_workers_unit.ml b/src/lib_workers/test/test_workers_unit.ml index a2303e3501580bf19901b5ad1ebeab58b31c9025..13211b76f00713d9e3ab4212af2e53b1e6d34a62 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 0fa7a2e970c6515f33eb626ebc712ee319c59225..9c67fc7a7e1cd63757651fc231f46d2fc03725eb 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 diff --git a/src/tooling/dune b/src/tooling/dune index b24dc2822b1b6b21546e1210d503164e54696491..d0feeb5614ef081b57b2dffe42e710cef3fb8783 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 feecd74211fec237edc53d41009687012252aed1..0000000000000000000000000000000000000000 --- 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 diff --git a/tezt/self_tests/test-basic.t b/tezt/self_tests/test-basic.t index 32921079f7cf82c2e63d14363a95495bf88bacae..671505570fcfcc7f5b01bd103fd38e0468f3f8c3 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 fb089cbbeea428b8d27efd3e06f526ed4c734494..809f169e3f39fb19e0a9f7a871122b1037b98511 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