From 07baef5b8242ed5e2ed9f5dd98cd188d7d3f8979 Mon Sep 17 00:00:00 2001 From: Craig Ferguson Date: Tue, 13 Oct 2020 23:21:48 +0200 Subject: [PATCH] Dune: upgrade all projects to lang version 2.0 - replace all `alias` stanzas with corresponding `rule` stanzas; - add no-op action fields (i.e. `(action (progn))`) to rules that previously had none; - comply with stricter requirements for `(select ...)` libraries used for conditional protocol linking by generating an empty file for each protocol. See https://github.com/ocaml/dune/pull/2867 for details of the new requirements on filenames; - disabling formatting of Dune files in `dune-project` files (enabled by default in lang 2.0+); - bump all `opam` dependencies on Dune to `{ >= "2.0" }`. Signed-off-by: Craig Ferguson --- docs/doc_gen/dune | 11 +- docs/doc_gen/errors/dune | 4 +- dune-project | 3 +- src/bin_client/dune | 84 ++++++----- src/bin_client/dune-project | 3 +- src/bin_client/tezos-client.opam | 2 +- src/bin_codec/dune | 28 ++-- src/bin_codec/dune-project | 3 +- src/bin_codec/tezos-codec.opam | 2 +- src/bin_node/dune | 92 +++++++----- src/bin_node/dune-project | 3 +- src/bin_node/tezos-node.opam | 2 +- src/bin_sandbox/dune | 51 +++---- src/bin_sandbox/dune-project | 3 +- src/bin_signer/dune | 4 +- src/bin_signer/dune-project | 3 +- src/bin_signer/tezos-signer.opam | 2 +- src/bin_validation/dune | 4 +- src/bin_validation/dune-project | 3 +- src/bin_validation/tezos-validator.opam | 2 +- src/lib_base/dune | 4 +- src/lib_base/dune-project | 3 +- src/lib_base/test/dune | 22 +-- src/lib_base/tezos-base.opam | 2 +- src/lib_base/unix/dune | 4 +- src/lib_benchmark/tezos-benchmark.opam | 2 +- src/lib_clic/dune | 4 +- src/lib_clic/dune-project | 3 +- src/lib_clic/tezos-clic.opam | 2 +- src/lib_clic/unix/dune | 4 +- src/lib_client_base/dune | 4 +- src/lib_client_base/dune-project | 3 +- src/lib_client_base/test/dune | 8 +- src/lib_client_base/tezos-client-base.opam | 2 +- src/lib_client_base_unix/dune | 4 +- src/lib_client_base_unix/dune-project | 3 +- .../tezos-client-base-unix.opam | 2 +- src/lib_client_commands/dune | 4 +- src/lib_client_commands/dune-project | 3 +- .../tezos-client-commands.opam | 2 +- src/lib_crypto/dune | 4 +- src/lib_crypto/dune-project | 3 +- src/lib_crypto/test/dune | 50 +++---- src/lib_crypto/tezos-crypto.opam | 2 +- src/lib_error_monad/dune | 4 +- src/lib_error_monad/dune-project | 3 +- src/lib_error_monad/test/dune | 18 +-- src/lib_error_monad/tezos-error-monad.opam | 2 +- src/lib_event_logging/dune | 4 +- src/lib_event_logging/dune-project | 3 +- .../tezos-event-logging.opam | 2 +- src/lib_lwt_result_stdlib/dune | 4 +- src/lib_lwt_result_stdlib/dune-project | 3 +- src/lib_lwt_result_stdlib/functors/dune | 4 +- src/lib_lwt_result_stdlib/lib/dune | 4 +- src/lib_lwt_result_stdlib/sigs/dune | 4 +- src/lib_lwt_result_stdlib/test/dune | 18 +-- .../tezos-lwt-result-stdlib.opam | 2 +- src/lib_micheline/dune | 4 +- src/lib_micheline/dune-project | 3 +- src/lib_micheline/test/dune | 22 +-- src/lib_micheline/tezos-micheline.opam | 2 +- src/lib_mockup/dune | 4 +- src/lib_mockup/dune-project | 3 +- src/lib_mockup/tezos-mockup-commands.opam | 2 +- src/lib_mockup/tezos-mockup-registration.opam | 2 +- src/lib_mockup/tezos-mockup.opam | 2 +- src/lib_p2p/dune | 4 +- src/lib_p2p/dune-project | 3 +- src/lib_p2p/test/dune | 54 +++---- src/lib_p2p/tezos-p2p.opam | 2 +- src/lib_p2p_services/dune | 4 +- src/lib_p2p_services/dune-project | 3 +- src/lib_p2p_services/tezos-p2p-services.opam | 2 +- src/lib_protocol_compiler/dune | 4 +- src/lib_protocol_compiler/dune-project | 3 +- src/lib_protocol_compiler/dune_protocol | 4 +- .../dune_protocol.template | 18 +-- src/lib_protocol_compiler/test/dune | 11 +- .../tezos-protocol-compiler.opam | 2 +- src/lib_protocol_environment/dune | 4 +- src/lib_protocol_environment/dune-project | 3 +- src/lib_protocol_environment/s_packer/dune | 4 +- src/lib_protocol_environment/test/dune | 15 +- .../tezos-protocol-environment-packer.opam | 2 +- .../tezos-protocol-environment-sigs.opam | 2 +- .../tezos-protocol-environment-structs.opam | 2 +- .../tezos-protocol-environment.opam | 2 +- .../tezos-shell-context.opam | 2 +- src/lib_protocol_updater/dune | 4 +- src/lib_protocol_updater/dune-project | 3 +- .../tezos-protocol-updater.opam | 2 +- src/lib_requester/dune | 4 +- src/lib_requester/dune-project | 3 +- src/lib_requester/test/dune | 11 +- src/lib_requester/tezos-requester.opam | 2 +- src/lib_rpc/dune | 4 +- src/lib_rpc/dune-project | 3 +- src/lib_rpc/tezos-rpc.opam | 2 +- src/lib_rpc_http/dune | 4 +- src/lib_rpc_http/dune-project | 3 +- .../tezos-rpc-http-client-unix.opam | 2 +- src/lib_rpc_http/tezos-rpc-http-client.opam | 2 +- src/lib_rpc_http/tezos-rpc-http-server.opam | 2 +- src/lib_rpc_http/tezos-rpc-http.opam | 2 +- src/lib_shell/bench/dune | 19 +-- src/lib_shell/dune | 4 +- src/lib_shell/dune-project | 3 +- src/lib_shell/test/dune | 34 ++--- src/lib_shell/tezos-shell.opam | 2 +- src/lib_shell_services/dune | 4 +- src/lib_shell_services/dune-project | 3 +- .../tezos-shell-services.opam | 2 +- src/lib_signer_backends/dune | 4 +- src/lib_signer_backends/dune-project | 3 +- src/lib_signer_backends/test/dune | 22 +-- .../tezos-signer-backends.opam | 2 +- src/lib_signer_backends/unix/dune | 10 +- .../{with_ledger.ml => ledger.available.ml} | 0 .../unix/{no_ledger.ml => ledger.none.ml} | 0 src/lib_signer_backends/unix/test/dune | 22 +-- src/lib_signer_services/dune | 4 +- src/lib_signer_services/dune-project | 3 +- .../tezos-signer-services.opam | 2 +- src/lib_stdlib/dune | 4 +- src/lib_stdlib/dune-project | 3 +- src/lib_stdlib/test/dune | 30 ++-- src/lib_stdlib/tezos-stdlib.opam | 2 +- src/lib_stdlib_unix/dune | 4 +- src/lib_stdlib_unix/dune-project | 3 +- src/lib_stdlib_unix/test/dune | 132 ++++++++++-------- src/lib_stdlib_unix/tezos-stdlib-unix.opam | 2 +- src/lib_storage/dune | 4 +- src/lib_storage/dune-project | 3 +- src/lib_storage/test/dune | 15 +- src/lib_storage/tezos-storage.opam | 2 +- src/lib_test_services/dune | 4 +- src/lib_test_services/dune-project | 3 +- .../tezos-test-services.opam | 2 +- src/lib_validation/dune | 4 +- src/lib_validation/dune-project | 3 +- src/lib_validation/tezos-validation.opam | 2 +- src/lib_version/dune-project | 3 +- src/lib_version/tezos-version.opam | 2 +- src/lib_workers/dune | 4 +- src/lib_workers/dune-project | 3 +- src/lib_workers/tezos-workers.opam | 2 +- src/proto_000_Ps9mPmXa/lib_client/dune | 4 +- .../lib_client/dune-project | 3 +- .../lib_client/tezos-client-000-Ps9mPmXa.opam | 2 +- .../lib_protocol/dune-project | 3 +- src/proto_000_Ps9mPmXa/lib_protocol/dune.inc | 18 +-- .../tezos-embedded-protocol-000-Ps9mPmXa.opam | 2 +- .../tezos-protocol-000-Ps9mPmXa.opam | 2 +- src/proto_001_PtCJ7pwo/lib_client/dune | 4 +- .../lib_client/dune-project | 3 +- .../lib_client/tezos-client-001-PtCJ7pwo.opam | 2 +- .../lib_client_commands/dune | 4 +- .../lib_client_commands/dune-project | 3 +- .../tezos-client-001-PtCJ7pwo-commands.opam | 2 +- .../lib_protocol/dune-project | 3 +- src/proto_001_PtCJ7pwo/lib_protocol/dune.inc | 18 +-- .../tezos-embedded-protocol-001-PtCJ7pwo.opam | 2 +- .../tezos-protocol-001-PtCJ7pwo.opam | 2 +- src/proto_002_PsYLVpVv/lib_client/dune | 4 +- .../lib_client/dune-project | 3 +- .../lib_client/tezos-client-002-PsYLVpVv.opam | 2 +- .../lib_client_commands/dune | 4 +- .../lib_client_commands/dune-project | 3 +- .../tezos-client-002-PsYLVpVv-commands.opam | 2 +- .../lib_protocol/dune-project | 3 +- src/proto_002_PsYLVpVv/lib_protocol/dune.inc | 18 +-- .../tezos-embedded-protocol-002-PsYLVpVv.opam | 2 +- .../tezos-protocol-002-PsYLVpVv.opam | 2 +- src/proto_003_PsddFKi3/lib_client/dune | 4 +- .../lib_client/dune-project | 3 +- .../lib_client/tezos-client-003-PsddFKi3.opam | 2 +- .../lib_client_commands/dune | 4 +- .../lib_client_commands/dune-project | 3 +- .../tezos-client-003-PsddFKi3-commands.opam | 2 +- .../lib_protocol/dune-project | 3 +- src/proto_003_PsddFKi3/lib_protocol/dune.inc | 18 +-- .../tezos-embedded-protocol-003-PsddFKi3.opam | 2 +- .../tezos-protocol-003-PsddFKi3.opam | 2 +- src/proto_004_Pt24m4xi/lib_client/dune | 4 +- .../lib_client/dune-project | 3 +- .../lib_client/tezos-client-004-Pt24m4xi.opam | 2 +- .../lib_client_commands/dune | 4 +- .../lib_client_commands/dune-project | 3 +- .../tezos-client-004-Pt24m4xi-commands.opam | 2 +- .../lib_protocol/dune-project | 3 +- src/proto_004_Pt24m4xi/lib_protocol/dune.inc | 18 +-- .../tezos-embedded-protocol-004-Pt24m4xi.opam | 2 +- .../tezos-protocol-004-Pt24m4xi.opam | 2 +- .../lib_protocol/dune-project | 3 +- src/proto_005_PsBABY5H/lib_protocol/dune.inc | 18 +-- .../tezos-embedded-protocol-005-PsBABY5H.opam | 2 +- .../tezos-protocol-005-PsBABY5H.opam | 2 +- src/proto_005_PsBabyM1/lib_client/dune | 4 +- .../lib_client/dune-project | 3 +- .../lib_client/tezos-client-005-PsBabyM1.opam | 2 +- .../lib_client_commands/dune | 4 +- .../lib_client_commands/dune-project | 3 +- .../tezos-client-005-PsBabyM1-commands.opam | 2 +- .../lib_protocol/dune-project | 3 +- src/proto_005_PsBabyM1/lib_protocol/dune.inc | 18 +-- .../tezos-embedded-protocol-005-PsBabyM1.opam | 2 +- .../tezos-protocol-005-PsBabyM1.opam | 2 +- src/proto_006_PsCARTHA/bin_accuser/dune | 4 +- .../bin_accuser/dune-project | 3 +- .../tezos-accuser-006-PsCARTHA.opam | 2 +- src/proto_006_PsCARTHA/bin_baker/dune | 4 +- src/proto_006_PsCARTHA/bin_baker/dune-project | 3 +- .../bin_baker/tezos-baker-006-PsCARTHA.opam | 2 +- src/proto_006_PsCARTHA/bin_endorser/dune | 4 +- .../bin_endorser/dune-project | 3 +- .../tezos-endorser-006-PsCARTHA.opam | 2 +- src/proto_006_PsCARTHA/lib_client/dune | 4 +- .../lib_client/dune-project | 3 +- src/proto_006_PsCARTHA/lib_client/test/dune | 22 +-- .../lib_client/tezos-client-006-PsCARTHA.opam | 2 +- .../lib_client_commands/dune | 4 +- .../lib_client_commands/dune-project | 3 +- .../tezos-client-006-PsCARTHA-commands.opam | 2 +- src/proto_006_PsCARTHA/lib_delegate/dune | 4 +- .../lib_delegate/dune-project | 3 +- .../tezos-accuser-006-PsCARTHA-commands.opam | 2 +- .../tezos-baking-006-PsCARTHA-commands.opam | 2 +- .../tezos-baking-006-PsCARTHA.opam | 2 +- .../tezos-endorser-006-PsCARTHA-commands.opam | 2 +- src/proto_006_PsCARTHA/lib_mempool/dune | 4 +- .../lib_mempool/dune-project | 3 +- .../tezos-mempool-006-PsCARTHA.opam | 2 +- src/proto_006_PsCARTHA/lib_parameters/dune | 4 +- .../lib_parameters/dune-project | 3 +- ...ezos-protocol-006-PsCARTHA-parameters.opam | 2 +- .../lib_protocol/dune-project | 3 +- src/proto_006_PsCARTHA/lib_protocol/dune.inc | 18 +-- src/proto_006_PsCARTHA/lib_protocol/test/dune | 26 ++-- .../lib_protocol/test/helpers/dune | 4 +- .../lib_protocol/test/helpers/dune-project | 3 +- .../tezos-006-PsCARTHA-test-helpers.opam | 2 +- .../tezos-embedded-protocol-006-PsCARTHA.opam | 2 +- .../tezos-protocol-006-PsCARTHA-tests.opam | 2 +- .../tezos-protocol-006-PsCARTHA.opam | 2 +- src/proto_007_PsDELPH1/bin_accuser/dune | 4 +- .../bin_accuser/dune-project | 3 +- .../tezos-accuser-007-PsDELPH1.opam | 2 +- src/proto_007_PsDELPH1/bin_baker/dune | 4 +- src/proto_007_PsDELPH1/bin_baker/dune-project | 3 +- .../bin_baker/tezos-baker-007-PsDELPH1.opam | 2 +- src/proto_007_PsDELPH1/bin_endorser/dune | 4 +- .../bin_endorser/dune-project | 3 +- .../tezos-endorser-007-PsDELPH1.opam | 2 +- src/proto_007_PsDELPH1/lib_client/dune | 4 +- .../lib_client/dune-project | 3 +- src/proto_007_PsDELPH1/lib_client/test/dune | 22 +-- .../lib_client/tezos-client-007-PsDELPH1.opam | 2 +- .../lib_client_commands/dune | 4 +- .../lib_client_commands/dune-project | 3 +- ...nt-007-PsDELPH1-commands-registration.opam | 2 +- .../tezos-client-007-PsDELPH1-commands.opam | 2 +- src/proto_007_PsDELPH1/lib_delegate/dune | 4 +- .../lib_delegate/dune-project | 3 +- .../tezos-accuser-007-PsDELPH1-commands.opam | 2 +- .../tezos-baking-007-PsDELPH1-commands.opam | 2 +- .../tezos-baking-007-PsDELPH1.opam | 2 +- .../tezos-endorser-007-PsDELPH1-commands.opam | 2 +- src/proto_007_PsDELPH1/lib_mempool/dune | 4 +- .../lib_mempool/dune-project | 3 +- .../tezos-mempool-007-PsDELPH1.opam | 2 +- src/proto_007_PsDELPH1/lib_parameters/dune | 4 +- .../lib_parameters/dune-project | 3 +- ...ezos-protocol-007-PsDELPH1-parameters.opam | 2 +- .../lib_protocol/dune-project | 3 +- src/proto_007_PsDELPH1/lib_protocol/dune.inc | 18 +-- src/proto_007_PsDELPH1/lib_protocol/test/dune | 26 ++-- .../lib_protocol/test/helpers/dune | 4 +- .../lib_protocol/test/helpers/dune-project | 3 +- .../tezos-007-PsDELPH1-test-helpers.opam | 2 +- .../tezos-embedded-protocol-007-PsDELPH1.opam | 2 +- .../tezos-protocol-007-PsDELPH1-tests.opam | 2 +- .../tezos-protocol-007-PsDELPH1.opam | 2 +- src/proto_alpha/bin_accuser/dune | 4 +- src/proto_alpha/bin_accuser/dune-project | 3 +- .../bin_accuser/tezos-accuser-alpha.opam | 2 +- src/proto_alpha/bin_baker/dune | 4 +- src/proto_alpha/bin_baker/dune-project | 3 +- .../bin_baker/tezos-baker-alpha.opam | 2 +- src/proto_alpha/bin_endorser/dune | 4 +- src/proto_alpha/bin_endorser/dune-project | 3 +- .../bin_endorser/tezos-endorser-alpha.opam | 2 +- src/proto_alpha/lib_client/dune | 4 +- src/proto_alpha/lib_client/dune-project | 3 +- src/proto_alpha/lib_client/test/dune | 22 +-- .../lib_client/tezos-client-alpha.opam | 2 +- src/proto_alpha/lib_client_commands/dune | 4 +- .../lib_client_commands/dune-project | 3 +- .../tezos-client-alpha-commands.opam | 2 +- src/proto_alpha/lib_delegate/dune | 4 +- src/proto_alpha/lib_delegate/dune-project | 3 +- .../tezos-accuser-alpha-commands.opam | 2 +- .../tezos-baking-alpha-commands.opam | 2 +- .../lib_delegate/tezos-baking-alpha.opam | 2 +- .../tezos-endorser-alpha-commands.opam | 2 +- src/proto_alpha/lib_mempool/dune | 4 +- src/proto_alpha/lib_mempool/dune-project | 3 +- .../lib_mempool/tezos-mempool-alpha.opam | 2 +- src/proto_alpha/lib_parameters/dune | 4 +- src/proto_alpha/lib_parameters/dune-project | 3 +- .../tezos-protocol-alpha-parameters.opam | 2 +- src/proto_alpha/lib_protocol/dune-project | 3 +- src/proto_alpha/lib_protocol/dune.inc | 18 +-- src/proto_alpha/lib_protocol/test/dune | 26 ++-- .../lib_protocol/test/helpers/dune | 4 +- .../lib_protocol/test/helpers/dune-project | 3 +- .../helpers/tezos-alpha-test-helpers.opam | 2 +- .../tezos-embedded-protocol-alpha.opam | 2 +- .../tezos-protocol-alpha-tests.opam | 2 +- .../lib_protocol/tezos-protocol-alpha.opam | 2 +- src/proto_demo_counter/lib_client/dune | 4 +- .../lib_client/dune-project | 3 +- .../lib_client/tezos-client-demo-counter.opam | 2 +- .../lib_protocol/dune-project | 3 +- src/proto_demo_counter/lib_protocol/dune.inc | 18 +-- .../tezos-embedded-protocol-demo-counter.opam | 2 +- .../tezos-protocol-demo-counter.opam | 2 +- .../lib_protocol/dune-project | 3 +- src/proto_demo_noops/lib_protocol/dune.inc | 18 +-- .../tezos-embedded-protocol-demo-noops.opam | 2 +- .../tezos-protocol-demo-noops.opam | 2 +- src/proto_genesis/lib_client/dune | 4 +- src/proto_genesis/lib_client/dune-project | 3 +- .../lib_client/tezos-client-genesis.opam | 2 +- src/proto_genesis/lib_protocol/dune-project | 3 +- src/proto_genesis/lib_protocol/dune.inc | 18 +-- .../tezos-embedded-protocol-genesis.opam | 2 +- .../lib_protocol/tezos-protocol-genesis.opam | 2 +- src/proto_genesis_carthagenet/lib_client/dune | 4 +- .../lib_client/dune-project | 3 +- .../tezos-client-genesis-carthagenet.opam | 2 +- .../lib_protocol/dune-project | 3 +- .../lib_protocol/dune.inc | 18 +-- ...embedded-protocol-genesis-carthagenet.opam | 2 +- .../tezos-protocol-genesis-carthagenet.opam | 2 +- src/tooling/dune-project | 1 + src/tooling/tezos-tooling.opam | 2 +- tezt/lib/tezt.opam | 2 +- tezt/lib_tezos/tezt-tezos.opam | 2 +- 349 files changed, 1130 insertions(+), 920 deletions(-) rename src/lib_signer_backends/unix/{with_ledger.ml => ledger.available.ml} (100%) rename src/lib_signer_backends/unix/{no_ledger.ml => ledger.none.ml} (100%) diff --git a/docs/doc_gen/dune b/docs/doc_gen/dune index c0507cb47..85ecfdf5c 100644 --- a/docs/doc_gen/dune +++ b/docs/doc_gen/dune @@ -13,12 +13,13 @@ -open Tezos_protocol_updater -linkall))) -(alias - (name buildtest) +(rule + (alias buildtest) (deps rpc_doc.exe - p2p_doc.exe)) + p2p_doc.exe) + (action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/docs/doc_gen/errors/dune b/docs/doc_gen/errors/dune index 72ec62794..d6405a0f8 100644 --- a/docs/doc_gen/errors/dune +++ b/docs/doc_gen/errors/dune @@ -10,7 +10,7 @@ -safe-string -linkall))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/dune-project b/dune-project index b39a3f5b9..2f6b7f75e 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,5 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) ; dune-project files are automatically generated by dune but they are kept ; checked in the repository to allow building with Dune 2 seamlessly. diff --git a/src/bin_client/dune b/src/bin_client/dune index 5b53339bf..999ee0854 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -15,53 +15,53 @@ tezos-mockup-commands (select void_for_linking-genesis from - (tezos-client-genesis -> void_for_linking) - (-> void_for_linking)) + (tezos-client-genesis -> void_for_linking-genesis.empty) + (-> void_for_linking-genesis.empty)) (select void_for_linking-genesis-carthagenet from - (tezos-client-genesis-carthagenet -> void_for_linking) - (-> void_for_linking)) + (tezos-client-genesis-carthagenet -> void_for_linking-genesis-carthagenet.empty) + (-> void_for_linking-genesis-carthagenet.empty)) (select void_for_linking-000-Ps9mPmXa from - (tezos-client-000-Ps9mPmXa -> void_for_linking) - (-> void_for_linking)) + (tezos-client-000-Ps9mPmXa -> void_for_linking-000-Ps9mPmXa.empty) + (-> void_for_linking-000-Ps9mPmXa.empty)) (select void_for_linking-001-PtCJ7pwo from - (tezos-client-001-PtCJ7pwo-commands.registration -> void_for_linking) - (-> void_for_linking)) + (tezos-client-001-PtCJ7pwo-commands.registration -> void_for_linking-001-PtCJ7pwo.empty) + (-> void_for_linking-001-PtCJ7pwo.empty)) (select void_for_linking-002-PsYLVpVv from - (tezos-client-002-PsYLVpVv-commands.registration -> void_for_linking) - (-> void_for_linking)) + (tezos-client-002-PsYLVpVv-commands.registration -> void_for_linking-002-PsYLVpVv.empty) + (-> void_for_linking-002-PsYLVpVv.empty)) (select void_for_linking-003-PsddFKi3 from - (tezos-client-003-PsddFKi3-commands.registration -> void_for_linking) - (-> void_for_linking)) + (tezos-client-003-PsddFKi3-commands.registration -> void_for_linking-003-PsddFKi3.empty) + (-> void_for_linking-003-PsddFKi3.empty)) (select void_for_linking-004-Pt24m4xi from - (tezos-client-004-Pt24m4xi-commands.registration -> void_for_linking) - (-> void_for_linking)) + (tezos-client-004-Pt24m4xi-commands.registration -> void_for_linking-004-Pt24m4xi.empty) + (-> void_for_linking-004-Pt24m4xi.empty)) (select void_for_linking-005-PsBabyM1 from - (tezos-client-005-PsBabyM1-commands.registration -> void_for_linking) - (-> void_for_linking)) + (tezos-client-005-PsBabyM1-commands.registration -> void_for_linking-005-PsBabyM1.empty) + (-> void_for_linking-005-PsBabyM1.empty)) (select void_for_linking-006-PsCARTHA from - (tezos-client-006-PsCARTHA-commands.registration -> void_for_linking) - (-> void_for_linking)) + (tezos-client-006-PsCARTHA-commands.registration -> void_for_linking-006-PsCARTHA.empty) + (-> void_for_linking-006-PsCARTHA.empty)) (select void_for_linking-007-PsDELPH1 from - (tezos-client-007-PsDELPH1-commands-registration -> void_for_linking) - (-> void_for_linking)) + (tezos-client-007-PsDELPH1-commands-registration -> void_for_linking-007-PsDELPH1.empty) + (-> void_for_linking-007-PsDELPH1.empty)) (select void_for_linking-alpha from - (tezos-client-alpha-commands.registration -> void_for_linking) - (-> void_for_linking)) + (tezos-client-alpha-commands.registration -> void_for_linking-alpha.empty) + (-> void_for_linking-alpha.empty)) (select void_for_linking-demo-counter from - (tezos-client-demo-counter -> void_for_linking) - (-> void_for_linking)) + (tezos-client-demo-counter -> void_for_linking-demo-counter.empty) + (-> void_for_linking-demo-counter.empty)) (select void_for_linking-baking-alpha from - (tezos-baking-alpha-commands.registration -> void_for_linking) - (-> void_for_linking)) + (tezos-baking-alpha-commands.registration -> void_for_linking-baking-alpha.empty) + (-> void_for_linking-baking-alpha.empty)) (select void_for_linking-baking-006-PsCARTHA from - (tezos-baking-006-PsCARTHA-commands.registration -> void_for_linking) - (-> void_for_linking)) + (tezos-baking-006-PsCARTHA-commands.registration -> void_for_linking-baking-006-PsCARTHA.empty) + (-> void_for_linking-baking-006-PsCARTHA.empty)) (select void_for_linking-baking-007-PsDELPH1 from - (tezos-baking-007-PsDELPH1-commands.registration -> void_for_linking) - (-> void_for_linking)) + (tezos-baking-007-PsDELPH1-commands.registration -> void_for_linking-baking-007-PsDELPH1.empty) + (-> void_for_linking-baking-007-PsDELPH1.empty)) tezos-stdlib-unix tezos-client-base-unix @@ -77,15 +77,31 @@ -linkall))) (rule - (target void_for_linking) - (action (write-file ${target} ""))) + (action + (progn + (write-file void_for_linking-genesis.empty "") + (write-file void_for_linking-genesis.empty "") + (write-file void_for_linking-genesis-carthagenet.empty "") + (write-file void_for_linking-000-Ps9mPmXa.empty "") + (write-file void_for_linking-001-PtCJ7pwo.empty "") + (write-file void_for_linking-002-PsYLVpVv.empty "") + (write-file void_for_linking-003-PsddFKi3.empty "") + (write-file void_for_linking-004-Pt24m4xi.empty "") + (write-file void_for_linking-005-PsBabyM1.empty "") + (write-file void_for_linking-006-PsCARTHA.empty "") + (write-file void_for_linking-007-PsDELPH1.empty "") + (write-file void_for_linking-alpha.empty "") + (write-file void_for_linking-demo-counter.empty "") + (write-file void_for_linking-baking-alpha.empty "") + (write-file void_for_linking-baking-006-PsCARTHA.empty "") + (write-file void_for_linking-baking-007-PsDELPH1.empty "")))) (install (package tezos-client) (section bin) (files (tezos-init-sandboxed-client.sh as tezos-init-sandboxed-client.sh))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/bin_client/dune-project b/src/bin_client/dune-project index c9b502871..284c7871d 100644 --- a/src/bin_client/dune-project +++ b/src/bin_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client) diff --git a/src/bin_client/tezos-client.opam b/src/bin_client/tezos-client.opam index 3b3d73b77..9bb7cb483 100644 --- a/src/bin_client/tezos-client.opam +++ b/src/bin_client/tezos-client.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-base" diff --git a/src/bin_codec/dune b/src/bin_codec/dune index ae32d5d2a..8ceaa6266 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -11,17 +11,17 @@ tezos-clic tezos-signer-services (select void_for_linking-alpha from - (tezos-client-alpha -> void_for_linking) - (-> void_for_linking)) + (tezos-client-alpha -> void_for_linking-alpha.empty) + (-> void_for_linking-alpha.empty)) (select void_for_linking-005-PsBabyM1 from - (tezos-client-005-PsBabyM1 -> void_for_linking) - (-> void_for_linking)) + (tezos-client-005-PsBabyM1 -> void_for_linking-005-PsBabyM1.empty) + (-> void_for_linking-005-PsBabyM1.empty)) (select void_for_linking-006-PsCARTHA from - (tezos-client-006-PsCARTHA -> void_for_linking) - (-> void_for_linking)) + (tezos-client-006-PsCARTHA -> void_for_linking-006-PsCARTHA.empty) + (-> void_for_linking-006-PsCARTHA.empty)) (select void_for_linking-007-PsDELPH1 from - (tezos-client-007-PsDELPH1 -> void_for_linking) - (-> void_for_linking)) + (tezos-client-007-PsDELPH1 -> void_for_linking-007-PsDELPH1.empty) + (-> void_for_linking-007-PsDELPH1.empty)) ) (flags (:standard -open Data_encoding -open Tezos_base__TzPervasives @@ -33,10 +33,14 @@ -linkall))) (rule - (target void_for_linking) - (action (write-file ${target} ""))) + (action + (progn + (write-file void_for_linking-alpha.empty "") + (write-file void_for_linking-005-PsBabyM1.empty "") + (write-file void_for_linking-006-PsCARTHA.empty "") + (write-file void_for_linking-007-PsDELPH1.empty "")))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/bin_codec/dune-project b/src/bin_codec/dune-project index 2df04db62..5f4c107ea 100644 --- a/src/bin_codec/dune-project +++ b/src/bin_codec/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-codec) diff --git a/src/bin_codec/tezos-codec.opam b/src/bin_codec/tezos-codec.opam index 0d344e8eb..61c8a23d9 100644 --- a/src/bin_codec/tezos-codec.opam +++ b/src/bin_codec/tezos-codec.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "data-encoding" { = "0.2" } "tezos-base" "tezos-stdlib-unix" diff --git a/src/bin_node/dune b/src/bin_node/dune index d2387fa65..9d80a1542 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -23,54 +23,54 @@ tezos-validator tezos-shell-context tezos-protocol-updater - (select void_for_linking-genesis from - (tezos-embedded-protocol-genesis -> void_for_linking) - (-> void_for_linking)) - (select void_for_linking-genesis-carthagenet from - (tezos-embedded-protocol-genesis-carthagenet -> void_for_linking) - (-> void_for_linking)) + (select void_for_linking-embedded-protocol-genesis from + (tezos-embedded-protocol-genesis -> void_for_linking-embedded-protocol-genesis.empty) + (-> void_for_linking-embedded-protocol-genesis.empty)) + (select void_for_linking-embedded-protocol-genesis-carthagenet from + (tezos-embedded-protocol-genesis-carthagenet -> void_for_linking-embedded-protocol-genesis-carthagenet.empty) + (-> void_for_linking-embedded-protocol-genesis-carthagenet.empty)) (select void_for_linking-demo-noops from - (tezos-embedded-protocol-demo-noops -> void_for_linking) - (-> void_for_linking)) + (tezos-embedded-protocol-demo-noops -> void_for_linking-demo-noops.empty) + (-> void_for_linking-demo-noops.empty)) (select void_for_linking-demo-counter from - (tezos-embedded-protocol-demo-counter -> void_for_linking) - (-> void_for_linking)) + (tezos-embedded-protocol-demo-counter -> void_for_linking-demo-counter.empty) + (-> void_for_linking-demo-counter.empty)) (select void_for_linking-alpha from - (tezos-embedded-protocol-alpha -> void_for_linking) - (-> void_for_linking)) + (tezos-embedded-protocol-alpha -> void_for_linking-alpha.empty) + (-> void_for_linking-alpha.empty)) (select void_for_linking-000-Ps9mPmXa from - (tezos-embedded-protocol-000-Ps9mPmXa -> void_for_linking) - (-> void_for_linking)) + (tezos-embedded-protocol-000-Ps9mPmXa -> void_for_linking-000-Ps9mPmXa.empty) + (-> void_for_linking-000-Ps9mPmXa.empty)) (select void_for_linking-001-PtCJ7pwo from - (tezos-embedded-protocol-001-PtCJ7pwo -> void_for_linking) - (-> void_for_linking)) + (tezos-embedded-protocol-001-PtCJ7pwo-commands.registration -> void_for_linking-001-PtCJ7pwo.empty) + (-> void_for_linking-001-PtCJ7pwo.empty)) (select void_for_linking-002-PsYLVpVv from - (tezos-embedded-protocol-002-PsYLVpVv -> void_for_linking) - (-> void_for_linking)) + (tezos-embedded-protocol-002-PsYLVpVv-commands.registration -> void_for_linking-002-PsYLVpVv.empty) + (-> void_for_linking-002-PsYLVpVv.empty)) (select void_for_linking-003-PsddFKi3 from - (tezos-embedded-protocol-003-PsddFKi3 -> void_for_linking) - (-> void_for_linking)) + (tezos-embedded-protocol-003-PsddFKi3-commands.registration -> void_for_linking-003-PsddFKi3.empty) + (-> void_for_linking-003-PsddFKi3.empty)) (select void_for_linking-004-Pt24m4xi from - (tezos-embedded-protocol-004-Pt24m4xi -> void_for_linking) - (-> void_for_linking)) + (tezos-embedded-protocol-004-Pt24m4xi-commands.registration -> void_for_linking-004-Pt24m4xi.empty) + (-> void_for_linking-004-Pt24m4xi.empty)) (select void_for_linking-005-PsBABY5H from - (tezos-embedded-protocol-005-PsBABY5H -> void_for_linking) - (-> void_for_linking)) + (tezos-embedded-protocol-005-PsBABY5H -> void_for_linking-005-PsBABY5H.empty) + (-> void_for_linking-005-PsBABY5H.empty)) (select void_for_linking-005-PsBabyM1 from - (tezos-embedded-protocol-005-PsBabyM1 -> void_for_linking) - (-> void_for_linking)) + (tezos-embedded-protocol-005-PsBabyM1 -> void_for_linking-005-PsBabyM1.empty) + (-> void_for_linking-005-PsBabyM1.empty)) (select void_for_linking-006-PsCARTHA from - (tezos-embedded-protocol-006-PsCARTHA -> void_for_linking) - (-> void_for_linking)) + (tezos-embedded-protocol-006-PsCARTHA -> void_for_linking-006-PsCARTHA.empty) + (-> void_for_linking-006-PsCARTHA.empty)) (select void_for_linking-007-PsDELPH1 from - (tezos-embedded-protocol-007-PsDELPH1 -> void_for_linking) - (-> void_for_linking)) + (tezos-embedded-protocol-007-PsDELPH1 -> void_for_linking-007-PsDELPH1.empty) + (-> void_for_linking-007-PsDELPH1.empty)) (select void_for_linking-006-PsCARTHA-mempool from - (tezos-mempool-006-PsCARTHA -> void_for_linking) - (-> void_for_linking)) + (tezos-mempool-006-PsCARTHA -> void_for_linking-006-PsCARTHA-mempool.empty) + (-> void_for_linking-006-PsCARTHA-mempool.empty)) (select void_for_linking-007-PsDELPH1-mempool from - (tezos-mempool-007-PsDELPH1 -> void_for_linking) - (-> void_for_linking)) + (tezos-mempool-007-PsDELPH1 -> void_for_linking-007-PsDELPH1-mempool.empty) + (-> void_for_linking-007-PsDELPH1-mempool.empty)) cmdliner tls) (flags (:standard -open Tezos_base__TzPervasives @@ -89,15 +89,31 @@ -linkall))) (rule - (target void_for_linking) - (action (write-file ${target} ""))) + (action + (progn + (write-file void_for_linking-embedded-protocol-genesis.empty "") + (write-file void_for_linking-embedded-protocol-genesis-carthagenet.empty "") + (write-file void_for_linking-demo-noops.empty "") + (write-file void_for_linking-demo-counter.empty "") + (write-file void_for_linking-alpha.empty "") + (write-file void_for_linking-000-Ps9mPmXa.empty "") + (write-file void_for_linking-001-PtCJ7pwo.empty "") + (write-file void_for_linking-002-PsYLVpVv.empty "") + (write-file void_for_linking-003-PsddFKi3.empty "") + (write-file void_for_linking-004-Pt24m4xi.empty "") + (write-file void_for_linking-005-PsBABY5H.empty "") + (write-file void_for_linking-005-PsBabyM1.empty "") + (write-file void_for_linking-006-PsCARTHA.empty "") + (write-file void_for_linking-007-PsDELPH1.empty "") + (write-file void_for_linking-006-PsCARTHA-mempool.empty "") + (write-file void_for_linking-007-PsDELPH1-mempool.empty "")))) (install (package tezos-node) (section bin) (files (tezos-sandboxed-node.sh as tezos-sandboxed-node.sh))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/bin_node/dune-project b/src/bin_node/dune-project index 395df1c9d..451450828 100644 --- a/src/bin_node/dune-project +++ b/src/bin_node/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-node) diff --git a/src/bin_node/tezos-node.opam b/src/bin_node/tezos-node.opam index 811cda196..38991f1e9 100644 --- a/src/bin_node/tezos-node.opam +++ b/src/bin_node/tezos-node.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-version" "tezos-rpc-http-server" diff --git a/src/bin_sandbox/dune b/src/bin_sandbox/dune index f09bd8e22..3a54082f6 100644 --- a/src/bin_sandbox/dune +++ b/src/bin_sandbox/dune @@ -3,8 +3,8 @@ (libraries flextesa) (flags :standard)) -(alias - (name runtest_sandbox_accusations_simple_double_baking) +(rule + (alias runtest_sandbox_accusations_simple_double_baking) (locks /tcp-port/10000_range) (action (run %{exe:main.exe} accusations simple-double-baking @@ -14,8 +14,8 @@ --tezos-client-binary %{bin:tezos-client} --tezos-node-binary %{bin:tezos-node} ))) -(alias - (name runtest_sandbox_accusations_simple_double_endorsing) +(rule + (alias runtest_sandbox_accusations_simple_double_endorsing) (locks /tcp-port/20000_range) (action (run %{exe:main.exe} accusations simple-double-endorsing @@ -25,8 +25,8 @@ --tezos-client-binary %{bin:tezos-client} --tezos-node-binary %{bin:tezos-node} ))) -(alias - (name runtest_sandbox_voting_demo_noops) +(rule + (alias runtest_sandbox_voting_demo_noops) (deps (package tezos-protocol-demo-noops)) (locks /tcp-port/30000_range) (action @@ -44,8 +44,8 @@ --current-node-binary %{bin:tezos-node} ))) -(alias - (name runtest_sandbox_user_activated_upgrade) +(rule + (alias runtest_sandbox_user_activated_upgrade) (locks /tcp-port/40000_range) (action (run %{exe:main.exe} mini-net @@ -69,8 +69,8 @@ ))) -(alias - (name runtest_sandbox_daemons_upgrade) +(rule + (alias runtest_sandbox_daemons_upgrade) (locks /tcp-port/50000_range) (action (run %{exe:main.exe} daemons-upgrade @@ -97,8 +97,8 @@ --second-accuser %{bin:tezos-accuser-alpha} ))) -(alias - (name runtest_sandbox_node_synchronization) +(rule + (alias runtest_sandbox_node_synchronization) (locks /tcp-port/15000_range) (action (run %{exe:main.exe} node-synchronization @@ -109,8 +109,8 @@ --should-synch true ))) -(alias - (name runtest_sandbox_node_synchronization) +(rule + (alias runtest_sandbox_node_synchronization) (locks /tcp-port/15000_range) (action (run %{exe:main.exe} node-synchronization @@ -121,8 +121,8 @@ --should-synch true ))) -(alias - (name runtest_sandbox_node_synchronization) +(rule + (alias runtest_sandbox_node_synchronization) (locks /tcp-port/15000_range) (action (run %{exe:main.exe} node-synchronization @@ -133,8 +133,8 @@ --should-synch true ))) -(alias - (name runtest_sandbox_node_synchronization) +(rule + (alias runtest_sandbox_node_synchronization) (locks /tcp-port/15000_range) (action (run %{exe:main.exe} node-synchronization @@ -145,8 +145,8 @@ --should-synch true ))) -(alias - (name runtest_sandbox_node_synchronization) +(rule + (alias runtest_sandbox_node_synchronization) (locks /tcp-port/15000_range) (action (run %{exe:main.exe} node-synchronization @@ -157,8 +157,8 @@ --should-synch false ))) -(alias - (name runtest_sandbox_node_synchronization) +(rule + (alias runtest_sandbox_node_synchronization) (locks /tcp-port/15000_range) (action (run %{exe:main.exe} node-synchronization @@ -169,12 +169,13 @@ --should-synch false ))) -(alias - (name runtest_flextesa) +(rule + (alias runtest_flextesa) (deps (alias runtest_sandbox_accusations_simple_double_baking) (alias runtest_sandbox_accusations_simple_double_endorsing) (alias runtest_sandbox_voting_demo_noops) (alias runtest_sandbox_user_activated_upgrade) (alias runtest_sandbox_daemons_upgrade) - (alias runtest_sandbox_node_synchronization))) + (alias runtest_sandbox_node_synchronization)) + (action (progn))) diff --git a/src/bin_sandbox/dune-project b/src/bin_sandbox/dune-project index 589bda843..26400d0a0 100644 --- a/src/bin_sandbox/dune-project +++ b/src/bin_sandbox/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-sandbox-tests) diff --git a/src/bin_signer/dune b/src/bin_signer/dune index 9d50c1205..2b8a8910f 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -23,7 +23,7 @@ -open Tezos_stdlib_unix -open Tezos_stdlib))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/bin_signer/dune-project b/src/bin_signer/dune-project index ae6da923a..c258e22dc 100644 --- a/src/bin_signer/dune-project +++ b/src/bin_signer/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-signer) diff --git a/src/bin_signer/tezos-signer.opam b/src/bin_signer/tezos-signer.opam index 7825e50d5..c8ebcf637 100644 --- a/src/bin_signer/tezos-signer.opam +++ b/src/bin_signer/tezos-signer.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-base" "tezos-client-base-unix" diff --git a/src/bin_validation/dune b/src/bin_validation/dune index f507ac7dd..060fec7c0 100644 --- a/src/bin_validation/dune +++ b/src/bin_validation/dune @@ -35,7 +35,7 @@ -linkall)) (modules Main_validator)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/bin_validation/dune-project b/src/bin_validation/dune-project index 04da2ef0a..b97e006e3 100644 --- a/src/bin_validation/dune-project +++ b/src/bin_validation/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-validator) diff --git a/src/bin_validation/tezos-validator.opam b/src/bin_validation/tezos-validator.opam index b78d61c39..307726d6d 100644 --- a/src/bin_validation/tezos-validator.opam +++ b/src/bin_validation/tezos-validator.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-storage" "tezos-stdlib-unix" diff --git a/src/lib_base/dune b/src/lib_base/dune index 4b9fbb317..9c0de2d1f 100644 --- a/src/lib_base/dune +++ b/src/lib_base/dune @@ -25,7 +25,7 @@ lwt ipaddr)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_base/dune-project b/src/lib_base/dune-project index 7dfbe2423..ec47892ac 100644 --- a/src/lib_base/dune-project +++ b/src/lib_base/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-base) diff --git a/src/lib_base/test/dune b/src/lib_base/test/dune index d139232a7..472ad523e 100644 --- a/src/lib_base/test/dune +++ b/src/lib_base/test/dune @@ -12,24 +12,26 @@ -open Tezos_base ))) -(alias - (name buildtest) +(rule + (alias buildtest) (deps test_time.exe test_p2p_addr.exe - )) + ) + (action (progn))) -(alias - (name runtest_time) +(rule + (alias runtest_time) (action (run %{exe:test_time.exe}))) -(alias - (name runtest_p2p_addr) +(rule + (alias runtest_p2p_addr) (action (run %{exe:test_p2p_addr.exe}))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-base) (deps (alias runtest_time) (alias runtest_p2p_addr) - )) + ) + (action (progn))) diff --git a/src/lib_base/tezos-base.opam b/src/lib_base/tezos-base.opam index 79372aee1..45e95e2b0 100644 --- a/src/lib_base/tezos-base.opam +++ b/src/lib_base/tezos-base.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-stdlib" "tezos-crypto" "data-encoding" { = "0.2" } diff --git a/src/lib_base/unix/dune b/src/lib_base/unix/dune index ab3936e53..d255c1882 100644 --- a/src/lib_base/unix/dune +++ b/src/lib_base/unix/dune @@ -14,7 +14,7 @@ tezos-stdlib-unix tezos-error-monad)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_benchmark/tezos-benchmark.opam b/src/lib_benchmark/tezos-benchmark.opam index 23e33b941..defa8f6cc 100644 --- a/src/lib_benchmark/tezos-benchmark.opam +++ b/src/lib_benchmark/tezos-benchmark.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "conf-autoconf" # Temporary opam file for the CI "hashcons" "stdcompat" diff --git a/src/lib_clic/dune b/src/lib_clic/dune index 69c5b059c..421a42c89 100644 --- a/src/lib_clic/dune +++ b/src/lib_clic/dune @@ -7,7 +7,7 @@ lwt tezos-error-monad)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_clic/dune-project b/src/lib_clic/dune-project index 604d1dca2..6894b0ca1 100644 --- a/src/lib_clic/dune-project +++ b/src/lib_clic/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-clic) diff --git a/src/lib_clic/tezos-clic.opam b/src/lib_clic/tezos-clic.opam index 689f3218f..905665b41 100644 --- a/src/lib_clic/tezos-clic.opam +++ b/src/lib_clic/tezos-clic.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "re" "tezos-stdlib" "tezos-stdlib-unix" diff --git a/src/lib_clic/unix/dune b/src/lib_clic/unix/dune index e2e3ba76b..346992e4b 100644 --- a/src/lib_clic/unix/dune +++ b/src/lib_clic/unix/dune @@ -8,7 +8,7 @@ tezos-stdlib-unix tezos-error-monad)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_client_base/dune b/src/lib_client_base/dune index 289ee0feb..debd48e47 100644 --- a/src/lib_client_base/dune +++ b/src/lib_client_base/dune @@ -16,7 +16,7 @@ gen/bip39_english.txt) (action (run %{exe} %{targets}))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_client_base/dune-project b/src/lib_client_base/dune-project index a0fb2d0c7..65a2ebc4d 100644 --- a/src/lib_client_base/dune-project +++ b/src/lib_client_base/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-base) diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune index b7a460137..17f18b501 100644 --- a/src/lib_client_base/test/dune +++ b/src/lib_client_base/test/dune @@ -4,8 +4,8 @@ (libraries tezos-client-base alcotest) (flags (:standard -open Tezos_client_base))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-client-base) (deps (:exe bip39_tests.exe)) (action (run %{exe}))) @@ -16,7 +16,7 @@ (libraries tezos-client-base alcotest) (flags (:standard -open Tezos_client_base))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-client-base) (action (run %{exe:pbkdf_tests.exe}))) diff --git a/src/lib_client_base/tezos-client-base.opam b/src/lib_client_base/tezos-client-base.opam index 63ffa5005..336ab5a59 100644 --- a/src/lib_client_base/tezos-client-base.opam +++ b/src/lib_client_base/tezos-client-base.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-stdlib-unix" "tezos-shell-services" diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune index e7540c101..5c604ae2f 100644 --- a/src/lib_client_base_unix/dune +++ b/src/lib_client_base_unix/dune @@ -21,7 +21,7 @@ -open Tezos_mockup_commands -linkall))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_client_base_unix/dune-project b/src/lib_client_base_unix/dune-project index 85f7ce26f..2856209a7 100644 --- a/src/lib_client_base_unix/dune-project +++ b/src/lib_client_base_unix/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-base-unix) diff --git a/src/lib_client_base_unix/tezos-client-base-unix.opam b/src/lib_client_base_unix/tezos-client-base-unix.opam index c19e01636..0e48481c8 100644 --- a/src/lib_client_base_unix/tezos-client-base-unix.opam +++ b/src/lib_client_base_unix/tezos-client-base-unix.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-base" "tezos-stdlib-unix" diff --git a/src/lib_client_commands/dune b/src/lib_client_commands/dune index 35b399cad..68b1d3cda 100644 --- a/src/lib_client_commands/dune +++ b/src/lib_client_commands/dune @@ -19,7 +19,7 @@ -open Tezos_p2p_services -open Data_encoding))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_client_commands/dune-project b/src/lib_client_commands/dune-project index a481c0df1..650ee9b8e 100644 --- a/src/lib_client_commands/dune-project +++ b/src/lib_client_commands/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-commands) diff --git a/src/lib_client_commands/tezos-client-commands.opam b/src/lib_client_commands/tezos-client-commands.opam index 48451e69d..d83f74e5a 100644 --- a/src/lib_client_commands/tezos-client-commands.opam +++ b/src/lib_client_commands/tezos-client-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-base" "tezos-rpc" diff --git a/src/lib_crypto/dune b/src/lib_crypto/dune index 5ccf240ab..eb0b99c96 100644 --- a/src/lib_crypto/dune +++ b/src/lib_crypto/dune @@ -18,7 +18,7 @@ ringo zarith)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_crypto/dune-project b/src/lib_crypto/dune-project index 2991d607b..d0db664b3 100644 --- a/src/lib_crypto/dune-project +++ b/src/lib_crypto/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-crypto) diff --git a/src/lib_crypto/test/dune b/src/lib_crypto/test/dune index 7ac811431..c9588bf3a 100644 --- a/src/lib_crypto/test/dune +++ b/src/lib_crypto/test/dune @@ -16,8 +16,8 @@ -open Tezos_crypto -open Data_encoding))) -(alias - (name buildtest) +(rule + (alias buildtest) (deps test_hacl.exe test_merkle.exe test_base58.exe @@ -25,42 +25,43 @@ test_blake2b.exe test_pvss.exe test_crypto_box.exe - test_deterministic_nonce.exe)) + test_deterministic_nonce.exe) + (action (progn))) -(alias - (name runtest_hacl) +(rule + (alias runtest_hacl) (action (run %{exe:test_hacl.exe}))) -(alias - (name runtest_merkle) +(rule + (alias runtest_merkle) (action (run %{exe:test_merkle.exe}))) -(alias - (name runtest_base58) +(rule + (alias runtest_base58) (action (run %{exe:test_base58.exe}))) -(alias - (name runtest_ed25519) +(rule + (alias runtest_ed25519) (action (run %{exe:test_ed25519.exe}))) -(alias - (name runtest_blake2b) +(rule + (alias runtest_blake2b) (action (run %{exe:test_blake2b.exe}))) -(alias - (name runtest_pvss) +(rule + (alias runtest_pvss) (action (run %{exe:test_pvss.exe}))) -(alias - (name runtest_crypto_box) +(rule + (alias runtest_crypto_box) (action (run %{exe:test_crypto_box.exe}))) -(alias - (name runtest_deterministic_nonce) +(rule + (alias runtest_deterministic_nonce) (action (run %{exe:test_deterministic_nonce.exe}))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-crypto) (deps (alias runtest_hacl) (alias runtest_merkle) @@ -69,9 +70,10 @@ (alias runtest_blake2b) (alias runtest_pvss) (alias runtest_crypto_box) - (alias runtest_deterministic_nonce))) + (alias runtest_deterministic_nonce)) + (action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_crypto/tezos-crypto.opam b/src/lib_crypto/tezos-crypto.opam index c2a597978..c694a432b 100644 --- a/src/lib_crypto/tezos-crypto.opam +++ b/src/lib_crypto/tezos-crypto.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-stdlib" "data-encoding" { = "0.2" } "tezos-error-monad" diff --git a/src/lib_error_monad/dune b/src/lib_error_monad/dune index 3a4a64065..66e4e08aa 100644 --- a/src/lib_error_monad/dune +++ b/src/lib_error_monad/dune @@ -9,7 +9,7 @@ lwt-canceler lwt)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_error_monad/dune-project b/src/lib_error_monad/dune-project index e13475ff4..ee4aba10e 100644 --- a/src/lib_error_monad/dune-project +++ b/src/lib_error_monad/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-error-monad) diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune index 6dd0f97a6..b8c7ab540 100644 --- a/src/lib_error_monad/test/dune +++ b/src/lib_error_monad/test/dune @@ -6,15 +6,17 @@ alcotest-lwt) (flags (:standard -open Tezos_error_monad))) -(alias - (name buildtest) - (deps test_recursive_registration.exe)) +(rule + (alias buildtest) + (deps test_recursive_registration.exe) + (action (progn))) -(alias - (name runtest_recursive_registration) +(rule + (alias runtest_recursive_registration) (action (run %{exe:test_recursive_registration.exe}))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-error-monad) - (deps (alias runtest_recursive_registration))) + (deps (alias runtest_recursive_registration)) + (action (progn))) diff --git a/src/lib_error_monad/tezos-error-monad.opam b/src/lib_error_monad/tezos-error-monad.opam index c4dba5058..7727af4f2 100644 --- a/src/lib_error_monad/tezos-error-monad.opam +++ b/src/lib_error_monad/tezos-error-monad.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "ocaml" { >= "4.07" } "tezos-stdlib" "data-encoding" { = "0.2" } diff --git a/src/lib_event_logging/dune b/src/lib_event_logging/dune index 2c630f8c7..a0057aa9f 100644 --- a/src/lib_event_logging/dune +++ b/src/lib_event_logging/dune @@ -10,7 +10,7 @@ tezos-error-monad lwt_log.core)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_event_logging/dune-project b/src/lib_event_logging/dune-project index b286d7e24..8ba59d159 100644 --- a/src/lib_event_logging/dune-project +++ b/src/lib_event_logging/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-event-logging) diff --git a/src/lib_event_logging/tezos-event-logging.opam b/src/lib_event_logging/tezos-event-logging.opam index d12eb837b..90f4ddb22 100644 --- a/src/lib_event_logging/tezos-event-logging.opam +++ b/src/lib_event_logging/tezos-event-logging.opam @@ -8,7 +8,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.0.1" } + "dune" { >= "2.0" } "tezos-stdlib" "data-encoding" { = "0.2" } "tezos-error-monad" diff --git a/src/lib_lwt_result_stdlib/dune b/src/lib_lwt_result_stdlib/dune index bf5ef425a..177e327e0 100644 --- a/src/lib_lwt_result_stdlib/dune +++ b/src/lib_lwt_result_stdlib/dune @@ -8,7 +8,7 @@ tezos-lwt-result-stdlib.functors tezos-lwt-result-stdlib.lib)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_lwt_result_stdlib/dune-project b/src/lib_lwt_result_stdlib/dune-project index f139b54d6..97c53b071 100644 --- a/src/lib_lwt_result_stdlib/dune-project +++ b/src/lib_lwt_result_stdlib/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-lwt-result-stdlib) diff --git a/src/lib_lwt_result_stdlib/functors/dune b/src/lib_lwt_result_stdlib/functors/dune index 43330b85f..0047954b6 100644 --- a/src/lib_lwt_result_stdlib/functors/dune +++ b/src/lib_lwt_result_stdlib/functors/dune @@ -4,7 +4,7 @@ (flags (:standard)) (libraries lwt tezos-lwt-result-stdlib.sigs)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_lwt_result_stdlib/lib/dune b/src/lib_lwt_result_stdlib/lib/dune index 989575c40..99d21837c 100644 --- a/src/lib_lwt_result_stdlib/lib/dune +++ b/src/lib_lwt_result_stdlib/lib/dune @@ -7,7 +7,7 @@ tezos-lwt-result-stdlib.sigs tezos-lwt-result-stdlib.functors)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_lwt_result_stdlib/sigs/dune b/src/lib_lwt_result_stdlib/sigs/dune index b7c0d48a5..e02303d21 100644 --- a/src/lib_lwt_result_stdlib/sigs/dune +++ b/src/lib_lwt_result_stdlib/sigs/dune @@ -4,7 +4,7 @@ (flags (:standard)) (libraries lwt)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_lwt_result_stdlib/test/dune b/src/lib_lwt_result_stdlib/test/dune index 2eaac865f..f763639f1 100644 --- a/src/lib_lwt_result_stdlib/test/dune +++ b/src/lib_lwt_result_stdlib/test/dune @@ -6,15 +6,17 @@ alcotest-lwt) (flags (:standard -open Tezos_lwt_result_stdlib))) -(alias - (name buildtest) - (deps test_hashtbl.exe)) +(rule + (alias buildtest) + (deps test_hashtbl.exe) + (action (progn))) -(alias - (name runtest_hashtbl) +(rule + (alias runtest_hashtbl) (action (run %{exe:test_hashtbl.exe}))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-lwt-result-stdlib) - (deps (alias runtest_hashtbl))) + (deps (alias runtest_hashtbl)) + (action (progn))) diff --git a/src/lib_lwt_result_stdlib/tezos-lwt-result-stdlib.opam b/src/lib_lwt_result_stdlib/tezos-lwt-result-stdlib.opam index 6fb5f31fa..efacbd864 100644 --- a/src/lib_lwt_result_stdlib/tezos-lwt-result-stdlib.opam +++ b/src/lib_lwt_result_stdlib/tezos-lwt-result-stdlib.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "ocaml" { >= "4.07" } "tezos-error-monad" "lwt" diff --git a/src/lib_micheline/dune b/src/lib_micheline/dune index 5cc129a49..ae448b551 100644 --- a/src/lib_micheline/dune +++ b/src/lib_micheline/dune @@ -14,7 +14,7 @@ -open Tezos_error_monad -open Data_encoding))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_micheline/dune-project b/src/lib_micheline/dune-project index f4d0ac7c5..020b48433 100644 --- a/src/lib_micheline/dune-project +++ b/src/lib_micheline/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-micheline) diff --git a/src/lib_micheline/test/dune b/src/lib_micheline/test/dune index ecdbbbd69..ec1f69ff0 100644 --- a/src/lib_micheline/test/dune +++ b/src/lib_micheline/test/dune @@ -4,20 +4,22 @@ alcotest-lwt) (flags (:standard -open Tezos_micheline))) -(alias - (name buildtest) - (deps test_parser.exe)) +(rule + (alias buildtest) + (deps test_parser.exe) + (action progn)) -(alias - (name runtest_micheline_parser) +(rule + (alias runtest_micheline_parser) (action (run %{exe:test_parser.exe}))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-micheline) - (deps (alias runtest_micheline_parser))) + (deps (alias runtest_micheline_parser)) + (action progn)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_micheline/tezos-micheline.opam b/src/lib_micheline/tezos-micheline.opam index 2c8c33f60..9036c7da1 100644 --- a/src/lib_micheline/tezos-micheline.opam +++ b/src/lib_micheline/tezos-micheline.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "data-encoding" { = "0.2" } "tezos-error-monad" "uutf" diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune index e952ad6c2..fcb66c808 100644 --- a/src/lib_mockup/dune +++ b/src/lib_mockup/dune @@ -42,7 +42,7 @@ -open Tezos_mockup -open Tezos_mockup_registration))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_mockup/dune-project b/src/lib_mockup/dune-project index 6d9ce4bcf..7707f34ef 100644 --- a/src/lib_mockup/dune-project +++ b/src/lib_mockup/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-mockup) diff --git a/src/lib_mockup/tezos-mockup-commands.opam b/src/lib_mockup/tezos-mockup-commands.opam index 1537951ec..30d431afd 100644 --- a/src/lib_mockup/tezos-mockup-commands.opam +++ b/src/lib_mockup/tezos-mockup-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } - "dune" { >= "1.7" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-commands" "tezos-client-base" diff --git a/src/lib_mockup/tezos-mockup-registration.opam b/src/lib_mockup/tezos-mockup-registration.opam index 967c284a4..a18faf667 100644 --- a/src/lib_mockup/tezos-mockup-registration.opam +++ b/src/lib_mockup/tezos-mockup-registration.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } - "dune" { >= "1.7" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-base" "tezos-shell-services" diff --git a/src/lib_mockup/tezos-mockup.opam b/src/lib_mockup/tezos-mockup.opam index 190c8afb8..2e1741703 100644 --- a/src/lib_mockup/tezos-mockup.opam +++ b/src/lib_mockup/tezos-mockup.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } - "dune" { >= "1.7" } + "dune" { >= "2.0" } "tezos-stdlib-unix" "tezos-base" "tezos-client-base" diff --git a/src/lib_p2p/dune b/src/lib_p2p/dune index fced974e0..00a108dea 100644 --- a/src/lib_p2p/dune +++ b/src/lib_p2p/dune @@ -13,7 +13,7 @@ -open Tezos_stdlib -open Tezos_p2p_services))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_p2p/dune-project b/src/lib_p2p/dune-project index 6d3551e17..3ce9868f2 100644 --- a/src/lib_p2p/dune-project +++ b/src/lib_p2p/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-p2p) diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune index 23349ed8c..f222034ed 100644 --- a/src/lib_p2p/test/dune +++ b/src/lib_p2p/test/dune @@ -16,44 +16,45 @@ -open Tezos_stdlib -open Tezos_p2p))) -(alias - (name buildtest) +(rule + (alias buildtest) (deps test_p2p_socket.exe test_p2p_pool.exe test_p2p_io_scheduler.exe test_p2p_peerset.exe test_p2p_ipv6set.exe test_p2p_banned_peers.exe - )) + ) + (action (progn))) -(alias - (name runtest_p2p_socket) +(rule + (alias runtest_p2p_socket) (action (run %{exe:test_p2p_socket.exe} -v))) -(alias - (name runtest_p2p_pool) +(rule + (alias runtest_p2p_pool) (action (run %{exe:test_p2p_pool.exe} --clients 10 --repeat 5 -v))) -(alias - (name runtest_p2p_io_scheduler) +(rule + (alias runtest_p2p_io_scheduler) (action (run %{exe:test_p2p_io_scheduler.exe} --delay 5 --clients 8 --max-upload-speed 262144 ;; 1 << 18 = 256kB --max-download-speed 1048576 ;; 1 << 20 = 1MB ))) -(alias - (name runtest_p2p_socket_ipv4) +(rule + (alias runtest_p2p_socket_ipv4) (action (run %{exe:test_p2p_socket.exe} -v --addr "::ffff:127.0.0.1"))) -(alias - (name runtest_p2p_pool_ipv4) +(rule + (alias runtest_p2p_pool_ipv4) (action (run %{exe:test_p2p_pool.exe} --clients 10 --repeat 5 -v --addr "::ffff:127.0.0.1"))) -(alias - (name runtest_p2p_io_scheduler_ipv4) +(rule + (alias runtest_p2p_io_scheduler_ipv4) (action (run %{exe:test_p2p_io_scheduler.exe} --delay 5 --clients 8 --max-upload-speed 262144 ;; 1 << 18 = 256kB @@ -61,20 +62,20 @@ --addr "::ffff:127.0.0.1" ))) -(alias - (name runtest_p2p_ipv6set) +(rule + (alias runtest_p2p_ipv6set) (action (run %{exe:test_p2p_ipv6set.exe} -v))) -(alias - (name runtest_p2p_peerset) +(rule + (alias runtest_p2p_peerset) (action (run %{exe:test_p2p_peerset.exe} -v))) -(alias - (name runtest_p2p_banned_peers) +(rule + (alias runtest_p2p_banned_peers) (action (run %{exe:test_p2p_banned_peers.exe} -v))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-p2p) (deps (alias runtest_p2p_socket_ipv4) (alias runtest_p2p_pool_ipv4) @@ -82,9 +83,10 @@ (alias runtest_p2p_peerset) (alias runtest_p2p_ipv6set) (alias runtest_p2p_banned_peers) - )) + ) + (action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_p2p/tezos-p2p.opam b/src/lib_p2p/tezos-p2p.opam index a7782dc09..0cc0ed6e3 100644 --- a/src/lib_p2p/tezos-p2p.opam +++ b/src/lib_p2p/tezos-p2p.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-stdlib-unix" "tezos-p2p-services" diff --git a/src/lib_p2p_services/dune b/src/lib_p2p_services/dune index 55f8555c6..b41bf73eb 100644 --- a/src/lib_p2p_services/dune +++ b/src/lib_p2p_services/dune @@ -7,7 +7,7 @@ )) ) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_p2p_services/dune-project b/src/lib_p2p_services/dune-project index f4e4ae576..e2fc640f5 100644 --- a/src/lib_p2p_services/dune-project +++ b/src/lib_p2p_services/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-p2p-services) \ No newline at end of file diff --git a/src/lib_p2p_services/tezos-p2p-services.opam b/src/lib_p2p_services/tezos-p2p-services.opam index 9bb3431ba..7ad84a9d1 100644 --- a/src/lib_p2p_services/tezos-p2p-services.opam +++ b/src/lib_p2p_services/tezos-p2p-services.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" ] build: [ diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune index 330be0016..92e9162ed 100644 --- a/src/lib_protocol_compiler/dune +++ b/src/lib_protocol_compiler/dune @@ -106,7 +106,7 @@ dune_protocol.template final_protocol_versions)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps} --ignore embedded_cmis.ml))) diff --git a/src/lib_protocol_compiler/dune-project b/src/lib_protocol_compiler/dune-project index 7d866f859..0e071fe17 100644 --- a/src/lib_protocol_compiler/dune-project +++ b/src/lib_protocol_compiler/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-protocol-compiler) diff --git a/src/lib_protocol_compiler/dune_protocol b/src/lib_protocol_compiler/dune_protocol index 14f8fb5b2..1ad264ca5 100644 --- a/src/lib_protocol_compiler/dune_protocol +++ b/src/lib_protocol_compiler/dune_protocol @@ -12,6 +12,6 @@ "dune.inc.gen" %{libexec:tezos-protocol-compiler:final_protocol_versions}))) -(alias - (name runtest_dune_template) +(rule + (alias runtest_dune_template) (action (diff dune.inc dune.inc.gen))) diff --git a/src/lib_protocol_compiler/dune_protocol.template b/src/lib_protocol_compiler/dune_protocol.template index ebdf4bdb8..0098ad588 100644 --- a/src/lib_protocol_compiler/dune_protocol.template +++ b/src/lib_protocol_compiler/dune_protocol.template @@ -100,18 +100,20 @@ include Tezos_raw_protocol_%%LIB_VERSION%%.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps %%SOURCES%% (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} %%COMPILE_OPTION%% .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_%%LIB_VERSION%%.objs/native/tezos_protocol_%%LIB_VERSION%%.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_%%LIB_VERSION%%.objs/native/tezos_protocol_%%LIB_VERSION%%.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-%%VERSION%%) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/lib_protocol_compiler/test/dune b/src/lib_protocol_compiler/test/dune index 19b6295d4..ec904c13a 100644 --- a/src/lib_protocol_compiler/test/dune +++ b/src/lib_protocol_compiler/test/dune @@ -1,5 +1,5 @@ -(alias - (name runtest_rejections) +(rule + (alias runtest_rejections) (deps (package tezos-protocol-demo-noops)) (action (run @@ -9,7 +9,8 @@ %{lib:tezos-protocol-demo-noops:raw/TEZOS_PROTOCOL} ))) -(alias - (name runtest_out_of_opam) +(rule + (alias runtest_out_of_opam) (deps - (alias runtest_rejections))) + (alias runtest_rejections)) + (action (progn))) diff --git a/src/lib_protocol_compiler/tezos-protocol-compiler.opam b/src/lib_protocol_compiler/tezos-protocol-compiler.opam index 7b2f5d732..8813ebea1 100644 --- a/src/lib_protocol_compiler/tezos-protocol-compiler.opam +++ b/src/lib_protocol_compiler/tezos-protocol-compiler.opam @@ -9,7 +9,7 @@ depends: [ "tezos-tooling" { with-test } ## ocaml should be in sync with `script/version.sh` "ocaml" { = "4.09.1" } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "base-unix" "tezos-base" "tezos-protocol-environment" diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune index b77014c4e..a3870c87d 100644 --- a/src/lib_protocol_environment/dune +++ b/src/lib_protocol_environment/dune @@ -24,7 +24,7 @@ tezos-storage) (modules Shell_context)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_protocol_environment/dune-project b/src/lib_protocol_environment/dune-project index dbbf02dc6..33f27880d 100644 --- a/src/lib_protocol_environment/dune-project +++ b/src/lib_protocol_environment/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-protocol-environment) diff --git a/src/lib_protocol_environment/s_packer/dune b/src/lib_protocol_environment/s_packer/dune index da6f1e633..44a1afa69 100644 --- a/src/lib_protocol_environment/s_packer/dune +++ b/src/lib_protocol_environment/s_packer/dune @@ -11,7 +11,7 @@ (package tezos-protocol-environment-packer) (files (s_packer.exe as s_packer))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_protocol_environment/test/dune b/src/lib_protocol_environment/test/dune index b2a27d7ca..9c9b1150d 100644 --- a/src/lib_protocol_environment/test/dune +++ b/src/lib_protocol_environment/test/dune @@ -6,16 +6,17 @@ (flags (:standard -open Tezos_base__TzPervasives -open Tezos_protocol_environment))) -(alias - (name buildtest) - (deps test.exe)) +(rule + (alias buildtest) + (deps test.exe) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-environment) (action (run %{exe:test.exe}))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_protocol_environment/tezos-protocol-environment-packer.opam b/src/lib_protocol_environment/tezos-protocol-environment-packer.opam index 5e50ec7f7..a58bcf7bc 100644 --- a/src/lib_protocol_environment/tezos-protocol-environment-packer.opam +++ b/src/lib_protocol_environment/tezos-protocol-environment-packer.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } ] build: [ ["dune" "build" "-p" name "-j" jobs] diff --git a/src/lib_protocol_environment/tezos-protocol-environment-sigs.opam b/src/lib_protocol_environment/tezos-protocol-environment-sigs.opam index 687f29679..54c142d07 100644 --- a/src/lib_protocol_environment/tezos-protocol-environment-sigs.opam +++ b/src/lib_protocol_environment/tezos-protocol-environment-sigs.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-stdlib" { with-test } "tezos-protocol-environment-packer" ] diff --git a/src/lib_protocol_environment/tezos-protocol-environment-structs.opam b/src/lib_protocol_environment/tezos-protocol-environment-structs.opam index e393bcef2..8e1c334ff 100644 --- a/src/lib_protocol_environment/tezos-protocol-environment-structs.opam +++ b/src/lib_protocol_environment/tezos-protocol-environment-structs.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-stdlib" "tezos-crypto" "tezos-protocol-environment-packer" diff --git a/src/lib_protocol_environment/tezos-protocol-environment.opam b/src/lib_protocol_environment/tezos-protocol-environment.opam index 76e4abd85..118f50c53 100644 --- a/src/lib_protocol_environment/tezos-protocol-environment.opam +++ b/src/lib_protocol_environment/tezos-protocol-environment.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment-sigs" "tezos-protocol-environment-structs" diff --git a/src/lib_protocol_environment/tezos-shell-context.opam b/src/lib_protocol_environment/tezos-shell-context.opam index 51d8a6439..021bed5fd 100644 --- a/src/lib_protocol_environment/tezos-shell-context.opam +++ b/src/lib_protocol_environment/tezos-shell-context.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-storage" diff --git a/src/lib_protocol_updater/dune b/src/lib_protocol_updater/dune index 7120b97c0..390484a76 100644 --- a/src/lib_protocol_updater/dune +++ b/src/lib_protocol_updater/dune @@ -17,7 +17,7 @@ -open Tezos_shell_services -open Tezos_storage))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_protocol_updater/dune-project b/src/lib_protocol_updater/dune-project index e749cfbf7..1e06a777b 100644 --- a/src/lib_protocol_updater/dune-project +++ b/src/lib_protocol_updater/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-protocol-updater) diff --git a/src/lib_protocol_updater/tezos-protocol-updater.opam b/src/lib_protocol_updater/tezos-protocol-updater.opam index 8f8a1984a..c3114659a 100644 --- a/src/lib_protocol_updater/tezos-protocol-updater.opam +++ b/src/lib_protocol_updater/tezos-protocol-updater.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-micheline" "tezos-shell-services" diff --git a/src/lib_requester/dune b/src/lib_requester/dune index 4e69e91dd..b26e99dc5 100644 --- a/src/lib_requester/dune +++ b/src/lib_requester/dune @@ -7,7 +7,7 @@ (flags (:standard -open Tezos_base__TzPervasives -open Tezos_stdlib_unix))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_requester/dune-project b/src/lib_requester/dune-project index a91fb13eb..0c42d41b2 100644 --- a/src/lib_requester/dune-project +++ b/src/lib_requester/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-requester) diff --git a/src/lib_requester/test/dune b/src/lib_requester/test/dune index 284940466..49202bb15 100644 --- a/src/lib_requester/test/dune +++ b/src/lib_requester/test/dune @@ -11,11 +11,12 @@ -open Tezos_test_services))) -(alias - (name runtest_requester) +(rule + (alias runtest_requester) (action (run %{exe:test_requester.exe}))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-requester) - (deps (alias runtest_requester))) + (deps (alias runtest_requester)) + (action (progn))) diff --git a/src/lib_requester/tezos-requester.opam b/src/lib_requester/tezos-requester.opam index ceddb473c..ce63459b8 100644 --- a/src/lib_requester/tezos-requester.opam +++ b/src/lib_requester/tezos-requester.opam @@ -8,7 +8,7 @@ license: "MIT" depends: [ "tezos-tooling" { with-test } "ocamlfind" { build } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-stdlib-unix" "lwt-watcher" diff --git a/src/lib_rpc/dune b/src/lib_rpc/dune index 475c74b5a..42835aa21 100644 --- a/src/lib_rpc/dune +++ b/src/lib_rpc/dune @@ -8,7 +8,7 @@ (flags (:standard -open Data_encoding -open Tezos_error_monad))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_rpc/dune-project b/src/lib_rpc/dune-project index ce915d96e..8f5b22ed5 100644 --- a/src/lib_rpc/dune-project +++ b/src/lib_rpc/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-rpc) diff --git a/src/lib_rpc/tezos-rpc.opam b/src/lib_rpc/tezos-rpc.opam index 7c2003620..d85a3fec1 100644 --- a/src/lib_rpc/tezos-rpc.opam +++ b/src/lib_rpc/tezos-rpc.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-error-monad" "data-encoding" { = "0.2" } "resto" { = "0.5" } diff --git a/src/lib_rpc_http/dune b/src/lib_rpc_http/dune index 3ae6ecc83..876b5285d 100644 --- a/src/lib_rpc_http/dune +++ b/src/lib_rpc_http/dune @@ -39,7 +39,7 @@ -open Tezos_rpc -open Tezos_rpc_http))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_rpc_http/dune-project b/src/lib_rpc_http/dune-project index 4ebd167bc..daf2f5300 100644 --- a/src/lib_rpc_http/dune-project +++ b/src/lib_rpc_http/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-rpc-http) diff --git a/src/lib_rpc_http/tezos-rpc-http-client-unix.opam b/src/lib_rpc_http/tezos-rpc-http-client-unix.opam index f4aca1802..5f52530b5 100644 --- a/src/lib_rpc_http/tezos-rpc-http-client-unix.opam +++ b/src/lib_rpc_http/tezos-rpc-http-client-unix.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-stdlib-unix" "cohttp-lwt-unix" { >= "1.0.0" } diff --git a/src/lib_rpc_http/tezos-rpc-http-client.opam b/src/lib_rpc_http/tezos-rpc-http-client.opam index d69ff8118..16a6bb0ae 100644 --- a/src/lib_rpc_http/tezos-rpc-http-client.opam +++ b/src/lib_rpc_http/tezos-rpc-http-client.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-rpc-http" "resto-cohttp-client" { = "0.5" } diff --git a/src/lib_rpc_http/tezos-rpc-http-server.opam b/src/lib_rpc_http/tezos-rpc-http-server.opam index 0dc66a880..59ec58899 100644 --- a/src/lib_rpc_http/tezos-rpc-http-server.opam +++ b/src/lib_rpc_http/tezos-rpc-http-server.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-rpc-http" "resto-cohttp-server" { = "0.5" } diff --git a/src/lib_rpc_http/tezos-rpc-http.opam b/src/lib_rpc_http/tezos-rpc-http.opam index ced0ba599..717a70911 100644 --- a/src/lib_rpc_http/tezos-rpc-http.opam +++ b/src/lib_rpc_http/tezos-rpc-http.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "resto-directory" { = "0.5" } "resto-cohttp" { = "0.5" } diff --git a/src/lib_shell/bench/dune b/src/lib_shell/bench/dune index a94d36dbd..040e803b9 100644 --- a/src/lib_shell/bench/dune +++ b/src/lib_shell/bench/dune @@ -9,21 +9,22 @@ -open Tezos_protocol_alpha_parameters -open Tezos_alpha_test_helpers))) -(alias - (name buildtest) - (deps bench_tool.exe bench_simple.exe)) +(rule + (alias buildtest) + (deps bench_tool.exe bench_simple.exe) + (action progn)) -(alias - (name runbench_alpha_simple) +(rule + (alias runbench_alpha_simple) (deps bench_simple.exe) (action (chdir %{workspace_root} (run %{exe:bench_simple.exe})))) -(alias - (name runbench_alpha) +(rule + (alias runbench_alpha) (deps bench_tool.exe) (action (chdir %{workspace_root} (run %{exe:bench_tool.exe})))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_shell/dune b/src/lib_shell/dune index 6b4d773ec..774a2b4df 100644 --- a/src/lib_shell/dune +++ b/src/lib_shell/dune @@ -29,7 +29,7 @@ -open Tezos_validation -open Tezos_version))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_shell/dune-project b/src/lib_shell/dune-project index dda664d61..e5ac77b08 100644 --- a/src/lib_shell/dune-project +++ b/src/lib_shell/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-shell) diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index 1ab552760..e62c2da92 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -29,36 +29,38 @@ -open Tezos_validation))) -(alias - (name buildtest) +(rule + (alias buildtest) (deps test.exe test_locator.exe - test_synchronisation_heuristic_fuzzy.exe)) + test_synchronisation_heuristic_fuzzy.exe) + (action (progn))) -(alias - (name runtest_shell) +(rule + (alias runtest_shell) (action (run %{exe:test.exe}))) -(alias - (name runtest_locator) +(rule + (alias runtest_locator) (action (run %{exe:test_locator.exe} --no-bench))) -(alias - (name runtest_synchronisation) +(rule + (alias runtest_synchronisation) (action (run %{exe:test_synchronisation_heuristic_fuzzy.exe}))) -(alias - (name runbench_locator) +(rule + (alias runbench_locator) (action (run %{exe:test_locator.exe}))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-shell) (deps (alias runtest_shell) (alias runtest_locator) - (alias runtest_synchronisation))) + (alias runtest_synchronisation)) + (action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_shell/tezos-shell.opam b/src/lib_shell/tezos-shell.opam index c3496cf4d..98cbad0fd 100644 --- a/src/lib_shell/tezos-shell.opam +++ b/src/lib_shell/tezos-shell.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-version" "tezos-p2p" diff --git a/src/lib_shell_services/dune b/src/lib_shell_services/dune index 800caf693..f47740606 100644 --- a/src/lib_shell_services/dune +++ b/src/lib_shell_services/dune @@ -10,7 +10,7 @@ -open Tezos_p2p_services -open Tezos_version))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_shell_services/dune-project b/src/lib_shell_services/dune-project index cde657832..cedfaf44d 100644 --- a/src/lib_shell_services/dune-project +++ b/src/lib_shell_services/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-shell-services) diff --git a/src/lib_shell_services/tezos-shell-services.opam b/src/lib_shell_services/tezos-shell-services.opam index 3d631eddf..373cda0f8 100644 --- a/src/lib_shell_services/tezos-shell-services.opam +++ b/src/lib_shell_services/tezos-shell-services.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-workers" "tezos-p2p-services" diff --git a/src/lib_signer_backends/dune b/src/lib_signer_backends/dune index 79bab8d05..120236721 100644 --- a/src/lib_signer_backends/dune +++ b/src/lib_signer_backends/dune @@ -15,7 +15,7 @@ -open Tezos_signer_services -open Tezos_shell_services))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_signer_backends/dune-project b/src/lib_signer_backends/dune-project index b97ff61f9..f73927513 100644 --- a/src/lib_signer_backends/dune-project +++ b/src/lib_signer_backends/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-signer-backends) diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune index 03b9dc19d..d3822fac7 100644 --- a/src/lib_signer_backends/test/dune +++ b/src/lib_signer_backends/test/dune @@ -8,20 +8,22 @@ -open Tezos_client_base -open Tezos_signer_backends))) -(alias - (name buildtest) - (deps test_encrypted.exe)) +(rule + (alias buildtest) + (deps test_encrypted.exe) + (action (progn))) -(alias - (name runtest_signer_encrypted) +(rule + (alias runtest_signer_encrypted) (action (run %{exe:test_encrypted.exe}))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-signer-backends) - (deps (alias runtest_signer_encrypted))) + (deps (alias runtest_signer_encrypted)) + (action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_signer_backends/tezos-signer-backends.opam b/src/lib_signer_backends/tezos-signer-backends.opam index 041ade3fb..074ced5e3 100644 --- a/src/lib_signer_backends/tezos-signer-backends.opam +++ b/src/lib_signer_backends/tezos-signer-backends.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-stdlib-unix" "tezos-client-base" diff --git a/src/lib_signer_backends/unix/dune b/src/lib_signer_backends/unix/dune index 01b9fd96f..5f64fc867 100644 --- a/src/lib_signer_backends/unix/dune +++ b/src/lib_signer_backends/unix/dune @@ -1,7 +1,7 @@ (library (name tezos_signer_backends_unix) (public_name tezos-signer-backends.unix) - (modules (:standard \ no_ledger with_ledger)) + (modules (:standard)) (libraries ocplib-endian.bigstring tezos-signer-backends tezos-base @@ -9,8 +9,8 @@ tezos-stdlib-unix tezos-rpc-http-client-unix (select ledger.ml from - (ledgerwallet-tezos -> with_ledger.ml) - (-> no_ledger.ml))) + (ledgerwallet-tezos -> ledger.available.ml) + (-> ledger.none.ml))) (flags (:standard -open Tezos_base__TzPervasives -open Tezos_stdlib_unix -open Tezos_stdlib @@ -22,7 +22,7 @@ -open Tezos_signer_backends -open Tezos_shell_services))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps} --ignore ledger.ml))) diff --git a/src/lib_signer_backends/unix/with_ledger.ml b/src/lib_signer_backends/unix/ledger.available.ml similarity index 100% rename from src/lib_signer_backends/unix/with_ledger.ml rename to src/lib_signer_backends/unix/ledger.available.ml diff --git a/src/lib_signer_backends/unix/no_ledger.ml b/src/lib_signer_backends/unix/ledger.none.ml similarity index 100% rename from src/lib_signer_backends/unix/no_ledger.ml rename to src/lib_signer_backends/unix/ledger.none.ml diff --git a/src/lib_signer_backends/unix/test/dune b/src/lib_signer_backends/unix/test/dune index 2c065fdd6..fd46118a3 100644 --- a/src/lib_signer_backends/unix/test/dune +++ b/src/lib_signer_backends/unix/test/dune @@ -8,20 +8,22 @@ -open Tezos_client_base -open Tezos_signer_backends_unix))) -(alias - (name buildtest) - (deps test_crouching.exe)) +(rule + (alias buildtest) + (deps test_crouching.exe) + (action (progn))) -(alias - (name runtest_crouching) +(rule + (alias runtest_crouching) (action (run %{exe:test_crouching.exe}))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-signer-backends) - (deps (alias runtest_crouching))) + (deps (alias runtest_crouching)) + (action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_signer_services/dune b/src/lib_signer_services/dune index b2b64cbd9..29a631547 100644 --- a/src/lib_signer_services/dune +++ b/src/lib_signer_services/dune @@ -9,7 +9,7 @@ -open Tezos_client_base -linkall))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_signer_services/dune-project b/src/lib_signer_services/dune-project index 4312016d9..559e57e71 100644 --- a/src/lib_signer_services/dune-project +++ b/src/lib_signer_services/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-signer-services) diff --git a/src/lib_signer_services/tezos-signer-services.opam b/src/lib_signer_services/tezos-signer-services.opam index dfcfd9af6..aed5e827c 100644 --- a/src/lib_signer_services/tezos-signer-services.opam +++ b/src/lib_signer_services/tezos-signer-services.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-base" "tezos-rpc" diff --git a/src/lib_stdlib/dune b/src/lib_stdlib/dune index 6575d3ea0..8a72065b6 100644 --- a/src/lib_stdlib/dune +++ b/src/lib_stdlib/dune @@ -6,7 +6,7 @@ lwt) (flags :standard)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_stdlib/dune-project b/src/lib_stdlib/dune-project index c39fbdf54..23eb68b08 100644 --- a/src/lib_stdlib/dune-project +++ b/src/lib_stdlib/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-stdlib) diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune index 7bccb0ed8..f45d19b1f 100644 --- a/src/lib_stdlib/test/dune +++ b/src/lib_stdlib/test/dune @@ -10,32 +10,34 @@ lwt.unix) (flags (:standard -open Tezos_stdlib))) -(alias - (name buildtest) +(rule + (alias buildtest) (deps test_tzList.exe test_tzString.exe - test_lwt_pipe.exe)) + test_lwt_pipe.exe) + (action (progn))) -(alias - (name runtest_tzList) +(rule + (alias runtest_tzList) (action (run %{exe:test_tzList.exe}))) -(alias - (name runtest_tzString) +(rule + (alias runtest_tzString) (action (run %{exe:test_tzString.exe}))) -(alias - (name runtest_lwt_pipe) +(rule + (alias runtest_lwt_pipe) (action (run %{exe:test_lwt_pipe.exe}))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-stdlib) (deps (alias runtest_tzList) (alias runtest_tzString) - (alias runtest_lwt_pipe))) + (alias runtest_lwt_pipe)) + (action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_stdlib/tezos-stdlib.opam b/src/lib_stdlib/tezos-stdlib.opam index 381208996..55404bb98 100644 --- a/src/lib_stdlib/tezos-stdlib.opam +++ b/src/lib_stdlib/tezos-stdlib.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "hex" "lwt" "zarith" diff --git a/src/lib_stdlib_unix/dune b/src/lib_stdlib_unix/dune index 0abf780ab..4539125cf 100644 --- a/src/lib_stdlib_unix/dune +++ b/src/lib_stdlib_unix/dune @@ -17,7 +17,7 @@ mtime.clock.os lwt_log)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_stdlib_unix/dune-project b/src/lib_stdlib_unix/dune-project index db777034c..231c8ddaf 100644 --- a/src/lib_stdlib_unix/dune-project +++ b/src/lib_stdlib_unix/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-stdlib-unix) diff --git a/src/lib_stdlib_unix/test/dune b/src/lib_stdlib_unix/test/dune index 5a357c773..cfe70014f 100644 --- a/src/lib_stdlib_unix/test/dune +++ b/src/lib_stdlib_unix/test/dune @@ -17,96 +17,107 @@ lwt.unix) (flags (:standard -open Tezos_stdlib_unix))) -(alias - (name buildtest) - (deps test_lwt_exit_exit.exe)) +(rule + (alias buildtest) + (deps test_lwt_exit_exit.exe) + (action (progn))) -(alias - (name runtest_lwt_exit_exit) +(rule + (alias runtest_lwt_exit_exit) (action (run %{exe:test_lwt_exit_exit.exe}))) -(alias - (name buildtest) - (deps test_lwt_exit_exit_escape.exe)) +(rule + (alias buildtest) + (deps test_lwt_exit_exit_escape.exe) + (action (progn))) -(alias - (name runtest_lwt_exit_exit_escape) +(rule + (alias runtest_lwt_exit_exit_escape) (action (run %{exe:test_lwt_exit_exit_escape.exe}))) -(alias - (name buildtest) - (deps test_lwt_exit_return.exe)) +(rule + (alias buildtest) + (deps test_lwt_exit_return.exe) + (action (progn))) -(alias - (name runtest_lwt_exit_return) +(rule + (alias runtest_lwt_exit_return) (action (run %{exe:test_lwt_exit_return.exe}))) -(alias - (name buildtest) - (deps test_lwt_exit_after.exe)) +(rule + (alias buildtest) + (deps test_lwt_exit_after.exe) + (action (progn))) -(alias - (name runtest_lwt_exit_after) +(rule + (alias runtest_lwt_exit_after) (action (run %{exe:test_lwt_exit_after.exe}))) -(alias - (name buildtest) - (deps test_lwt_exit_signal.exe)) +(rule + (alias buildtest) + (deps test_lwt_exit_signal.exe) + (action (progn))) -(alias - (name runtest_lwt_exit_signal) +(rule + (alias runtest_lwt_exit_signal) (action (run %{exe:test_lwt_exit_signal.exe}))) -(alias - (name buildtest) - (deps test_lwt_exit_clean_up.exe)) +(rule + (alias buildtest) + (deps test_lwt_exit_clean_up.exe) + (action (progn))) -(alias - (name runtest_lwt_exit_clean_up) +(rule + (alias runtest_lwt_exit_clean_up) (action (run %{exe:test_lwt_exit_clean_up.exe}))) -(alias - (name buildtest) - (deps test_lwt_exit_unregister_clean_up.exe)) +(rule + (alias buildtest) + (deps test_lwt_exit_unregister_clean_up.exe) + (action (progn))) -(alias - (name runtest_test_lwt_exit_unregister_clean_up) +(rule + (alias runtest_test_lwt_exit_unregister_clean_up) (action (run %{exe:test_lwt_exit_unregister_clean_up.exe}))) -(alias - (name buildtest) - (deps test_lwt_exit_unregister_clean_up_with_after.exe)) +(rule + (alias buildtest) + (deps test_lwt_exit_unregister_clean_up_with_after.exe) + (action (progn))) -(alias - (name runtest_test_lwt_exit_unregister_clean_up_with_after) +(rule + (alias runtest_test_lwt_exit_unregister_clean_up_with_after) (action (run %{exe:test_lwt_exit_unregister_clean_up_with_after.exe}))) -(alias - (name buildtest) - (deps test_lwt_exit_raise.exe)) +(rule + (alias buildtest) + (deps test_lwt_exit_raise.exe) + (action (progn))) -(alias - (name runtest_test_lwt_exit_raise) +(rule + (alias runtest_test_lwt_exit_raise) (action (run %{exe:test_lwt_exit_raise.exe}))) -(alias - (name buildtest) - (deps test_lwt_exit_raise_exit.exe)) +(rule + (alias buildtest) + (deps test_lwt_exit_raise_exit.exe) + (action (progn))) -(alias - (name runtest_test_lwt_exit_raise_exit) +(rule + (alias runtest_test_lwt_exit_raise_exit) (action (run %{exe:test_lwt_exit_raise_exit.exe}))) -(alias - (name buildtest) - (deps test_lwt_exit_range_of_signals.exe)) +(rule + (alias buildtest) + (deps test_lwt_exit_range_of_signals.exe) + (action (progn))) -(alias - (name runtest_test_lwt_exit_range_of_signals) +(rule + (alias runtest_test_lwt_exit_range_of_signals) (action (run %{exe:test_lwt_exit_range_of_signals.exe}))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-stdlib-unix) (deps (alias runtest_lwt_exit_exit) (alias runtest_lwt_exit_exit_escape) @@ -119,9 +130,10 @@ (alias runtest_test_lwt_exit_raise) (alias runtest_test_lwt_exit_raise_exit) (alias runtest_test_lwt_exit_range_of_signals) - )) + ) + (action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_stdlib_unix/tezos-stdlib-unix.opam b/src/lib_stdlib_unix/tezos-stdlib-unix.opam index e5f284c2f..9ecebc444 100644 --- a/src/lib_stdlib_unix/tezos-stdlib-unix.opam +++ b/src/lib_stdlib_unix/tezos-stdlib-unix.opam @@ -8,7 +8,7 @@ license: "MIT" depends: [ "tezos-tooling" { with-test } "base-unix" - "dune" { >= "1.11" } + "dune" { >= "2.0" } "data-encoding" { = "0.2" } "tezos-error-monad" "tezos-event-logging" diff --git a/src/lib_storage/dune b/src/lib_storage/dune index 9b2930ed8..44dc3dbaf 100644 --- a/src/lib_storage/dune +++ b/src/lib_storage/dune @@ -14,7 +14,7 @@ -open Tezos_stdlib_unix -open Tezos_stdlib))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_storage/dune-project b/src/lib_storage/dune-project index 471dbefd9..6bf749f18 100644 --- a/src/lib_storage/dune-project +++ b/src/lib_storage/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-storage) diff --git a/src/lib_storage/test/dune b/src/lib_storage/test/dune index 6cb0eb55f..1dff078d5 100644 --- a/src/lib_storage/test/dune +++ b/src/lib_storage/test/dune @@ -8,16 +8,17 @@ -open Tezos_storage -open Tezos_stdlib_unix))) -(alias - (name buildtest) - (deps test.exe)) +(rule + (alias buildtest) + (deps test.exe) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-storage) (action (chdir %{workspace_root} (run %{exe:test.exe})))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_storage/tezos-storage.opam b/src/lib_storage/tezos-storage.opam index cf6c964fa..b7fa94c07 100644 --- a/src/lib_storage/tezos-storage.opam +++ b/src/lib_storage/tezos-storage.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-lmdb" "irmin" { >= "2.2.0" } diff --git a/src/lib_test_services/dune b/src/lib_test_services/dune index c12b2c0d0..a86cf7ad5 100644 --- a/src/lib_test_services/dune +++ b/src/lib_test_services/dune @@ -6,7 +6,7 @@ (flags (:standard -linkall -open Tezos_base__TzPervasives))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_test_services/dune-project b/src/lib_test_services/dune-project index 364fcc11c..0d603a5f8 100644 --- a/src/lib_test_services/dune-project +++ b/src/lib_test_services/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-test-services) diff --git a/src/lib_test_services/tezos-test-services.opam b/src/lib_test_services/tezos-test-services.opam index 316e5fe73..413a8f0ad 100644 --- a/src/lib_test_services/tezos-test-services.opam +++ b/src/lib_test_services/tezos-test-services.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "alcotest-lwt" ] diff --git a/src/lib_validation/dune b/src/lib_validation/dune index ebbbe8cfe..3a0eb2d3a 100644 --- a/src/lib_validation/dune +++ b/src/lib_validation/dune @@ -14,7 +14,7 @@ -open Tezos_protocol_updater -open Tezos_stdlib_unix))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_validation/dune-project b/src/lib_validation/dune-project index c303bd2d5..cd1dc0dfe 100644 --- a/src/lib_validation/dune-project +++ b/src/lib_validation/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-validation) diff --git a/src/lib_validation/tezos-validation.opam b/src/lib_validation/tezos-validation.opam index 5f178251e..e2df120f9 100644 --- a/src/lib_validation/tezos-validation.opam +++ b/src/lib_validation/tezos-validation.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-storage" "tezos-shell-context" diff --git a/src/lib_version/dune-project b/src/lib_version/dune-project index ccd9348d8..7bb207670 100644 --- a/src/lib_version/dune-project +++ b/src/lib_version/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-version) diff --git a/src/lib_version/tezos-version.opam b/src/lib_version/tezos-version.opam index b2f522740..93cb3200c 100644 --- a/src/lib_version/tezos-version.opam +++ b/src/lib_version/tezos-version.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" ] build: [ diff --git a/src/lib_workers/dune b/src/lib_workers/dune index dfd210343..cd6bca17a 100644 --- a/src/lib_workers/dune +++ b/src/lib_workers/dune @@ -9,8 +9,8 @@ -open Tezos_stdlib_unix ))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (package tezos-workers) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/lib_workers/dune-project b/src/lib_workers/dune-project index 54389413b..140b77109 100644 --- a/src/lib_workers/dune-project +++ b/src/lib_workers/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-workers) diff --git a/src/lib_workers/tezos-workers.opam b/src/lib_workers/tezos-workers.opam index 2e00f7095..09a910cc4 100644 --- a/src/lib_workers/tezos-workers.opam +++ b/src/lib_workers/tezos-workers.opam @@ -8,7 +8,7 @@ license: "MIT" depends: [ "tezos-tooling" { with-test } "ocamlfind" { build } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-stdlib-unix" "ringo" { = "0.5" } diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune b/src/proto_000_Ps9mPmXa/lib_client/dune index b75e7d6f4..acd0bd891 100644 --- a/src/proto_000_Ps9mPmXa/lib_client/dune +++ b/src/proto_000_Ps9mPmXa/lib_client/dune @@ -15,7 +15,7 @@ -open Tezos_protocol_000_Ps9mPmXa -open Tezos_client_commands))) -(alias - (name runtest_indent) +(rule + (alias runtest_indent) (deps (glob_files *.ml{,i})) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune-project b/src/proto_000_Ps9mPmXa/lib_client/dune-project index 83af21ca8..762545eb0 100644 --- a/src/proto_000_Ps9mPmXa/lib_client/dune-project +++ b/src/proto_000_Ps9mPmXa/lib_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-000-Ps9mPmXa) diff --git a/src/proto_000_Ps9mPmXa/lib_client/tezos-client-000-Ps9mPmXa.opam b/src/proto_000_Ps9mPmXa/lib_client/tezos-client-000-Ps9mPmXa.opam index 49de890ca..b7517d877 100644 --- a/src/proto_000_Ps9mPmXa/lib_client/tezos-client-000-Ps9mPmXa.opam +++ b/src/proto_000_Ps9mPmXa/lib_client/tezos-client-000-Ps9mPmXa.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune-project b/src/proto_000_Ps9mPmXa/lib_protocol/dune-project index 5bf4da09b..7b3539ee7 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune-project +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-000-Ps9mPmXa) diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/dune.inc b/src/proto_000_Ps9mPmXa/lib_protocol/dune.inc index 74c625a90..94ab31151 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/dune.inc +++ b/src/proto_000_Ps9mPmXa/lib_protocol/dune.inc @@ -116,8 +116,8 @@ include Tezos_raw_protocol_000_Ps9mPmXa.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps data.ml services.ml @@ -125,11 +125,13 @@ include Tezos_raw_protocol_000_Ps9mPmXa.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_000_Ps9mPmXa.objs/native/tezos_protocol_000_Ps9mPmXa.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_000_Ps9mPmXa.objs/native/tezos_protocol_000_Ps9mPmXa.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-000-Ps9mPmXa) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/tezos-embedded-protocol-000-Ps9mPmXa.opam b/src/proto_000_Ps9mPmXa/lib_protocol/tezos-embedded-protocol-000-Ps9mPmXa.opam index 735ed5fc9..d61075e12 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/tezos-embedded-protocol-000-Ps9mPmXa.opam +++ b/src/proto_000_Ps9mPmXa/lib_protocol/tezos-embedded-protocol-000-Ps9mPmXa.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-protocol-000-Ps9mPmXa" "tezos-protocol-compiler" "tezos-protocol-updater" diff --git a/src/proto_000_Ps9mPmXa/lib_protocol/tezos-protocol-000-Ps9mPmXa.opam b/src/proto_000_Ps9mPmXa/lib_protocol/tezos-protocol-000-Ps9mPmXa.opam index 63cb96c6f..9b428fcaf 100644 --- a/src/proto_000_Ps9mPmXa/lib_protocol/tezos-protocol-000-Ps9mPmXa.opam +++ b/src/proto_000_Ps9mPmXa/lib_protocol/tezos-protocol-000-Ps9mPmXa.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-protocol-compiler" ] build: [ diff --git a/src/proto_001_PtCJ7pwo/lib_client/dune b/src/proto_001_PtCJ7pwo/lib_client/dune index 7ac64286c..e30a930c7 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/dune +++ b/src/proto_001_PtCJ7pwo/lib_client/dune @@ -14,7 +14,7 @@ -open Tezos_client_base -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_001_PtCJ7pwo/lib_client/dune-project b/src/proto_001_PtCJ7pwo/lib_client/dune-project index 7ba0eacdf..804c408fd 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/dune-project +++ b/src/proto_001_PtCJ7pwo/lib_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-001-PtCJ7pwo) diff --git a/src/proto_001_PtCJ7pwo/lib_client/tezos-client-001-PtCJ7pwo.opam b/src/proto_001_PtCJ7pwo/lib_client/tezos-client-001-PtCJ7pwo.opam index 6f72732bb..8fec52655 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/tezos-client-001-PtCJ7pwo.opam +++ b/src/proto_001_PtCJ7pwo/lib_client/tezos-client-001-PtCJ7pwo.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-001-PtCJ7pwo" diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune b/src/proto_001_PtCJ7pwo/lib_client_commands/dune index 121639fcf..fdf30ed12 100644 --- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune +++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune @@ -46,7 +46,7 @@ -open Tezos_client_001_PtCJ7pwo_commands -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune-project b/src/proto_001_PtCJ7pwo/lib_client_commands/dune-project index c88487635..d32ad71b0 100644 --- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune-project +++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-001-PtCJ7pwo-commands) diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/tezos-client-001-PtCJ7pwo-commands.opam b/src/proto_001_PtCJ7pwo/lib_client_commands/tezos-client-001-PtCJ7pwo-commands.opam index 7c47b7785..5f7699588 100644 --- a/src/proto_001_PtCJ7pwo/lib_client_commands/tezos-client-001-PtCJ7pwo-commands.opam +++ b/src/proto_001_PtCJ7pwo/lib_client_commands/tezos-client-001-PtCJ7pwo-commands.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-001-PtCJ7pwo" diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune-project b/src/proto_001_PtCJ7pwo/lib_protocol/dune-project index b8801a0e9..f2c62afe2 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune-project +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-001-PtCJ7pwo) diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/dune.inc b/src/proto_001_PtCJ7pwo/lib_protocol/dune.inc index 84b150a45..200b9d0cf 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/dune.inc +++ b/src/proto_001_PtCJ7pwo/lib_protocol/dune.inc @@ -372,8 +372,8 @@ include Tezos_raw_protocol_001_PtCJ7pwo.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps misc.mli misc.ml storage_description.mli storage_description.ml @@ -445,11 +445,13 @@ include Tezos_raw_protocol_001_PtCJ7pwo.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_001_PtCJ7pwo.objs/native/tezos_protocol_001_PtCJ7pwo.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_001_PtCJ7pwo.objs/native/tezos_protocol_001_PtCJ7pwo.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-001-PtCJ7pwo) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/tezos-embedded-protocol-001-PtCJ7pwo.opam b/src/proto_001_PtCJ7pwo/lib_protocol/tezos-embedded-protocol-001-PtCJ7pwo.opam index 7c6665871..e9b5fbe03 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/tezos-embedded-protocol-001-PtCJ7pwo.opam +++ b/src/proto_001_PtCJ7pwo/lib_protocol/tezos-embedded-protocol-001-PtCJ7pwo.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-001-PtCJ7pwo" "tezos-protocol-compiler" diff --git a/src/proto_001_PtCJ7pwo/lib_protocol/tezos-protocol-001-PtCJ7pwo.opam b/src/proto_001_PtCJ7pwo/lib_protocol/tezos-protocol-001-PtCJ7pwo.opam index f116b4d32..30736ea1f 100644 --- a/src/proto_001_PtCJ7pwo/lib_protocol/tezos-protocol-001-PtCJ7pwo.opam +++ b/src/proto_001_PtCJ7pwo/lib_protocol/tezos-protocol-001-PtCJ7pwo.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-compiler" "alcotest-lwt" { with-test & >= "1.1.0" } diff --git a/src/proto_002_PsYLVpVv/lib_client/dune b/src/proto_002_PsYLVpVv/lib_client/dune index 02e1a7672..46c99daa1 100644 --- a/src/proto_002_PsYLVpVv/lib_client/dune +++ b/src/proto_002_PsYLVpVv/lib_client/dune @@ -15,7 +15,7 @@ -open Tezos_protocol_002_PsYLVpVv -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_002_PsYLVpVv/lib_client/dune-project b/src/proto_002_PsYLVpVv/lib_client/dune-project index a569bd280..b8828e827 100644 --- a/src/proto_002_PsYLVpVv/lib_client/dune-project +++ b/src/proto_002_PsYLVpVv/lib_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-002-PsYLVpVv) diff --git a/src/proto_002_PsYLVpVv/lib_client/tezos-client-002-PsYLVpVv.opam b/src/proto_002_PsYLVpVv/lib_client/tezos-client-002-PsYLVpVv.opam index 78d5e2ee4..e481e1795 100644 --- a/src/proto_002_PsYLVpVv/lib_client/tezos-client-002-PsYLVpVv.opam +++ b/src/proto_002_PsYLVpVv/lib_client/tezos-client-002-PsYLVpVv.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-002-PsYLVpVv" diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune b/src/proto_002_PsYLVpVv/lib_client_commands/dune index 3286d370c..32238f5c2 100644 --- a/src/proto_002_PsYLVpVv/lib_client_commands/dune +++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune @@ -46,7 +46,7 @@ -open Tezos_client_002_PsYLVpVv_commands -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune-project b/src/proto_002_PsYLVpVv/lib_client_commands/dune-project index 4561ea476..e0f0618a3 100644 --- a/src/proto_002_PsYLVpVv/lib_client_commands/dune-project +++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-002-PsYLVpVv-commands) diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/tezos-client-002-PsYLVpVv-commands.opam b/src/proto_002_PsYLVpVv/lib_client_commands/tezos-client-002-PsYLVpVv-commands.opam index 40b054c13..c56b6a97b 100644 --- a/src/proto_002_PsYLVpVv/lib_client_commands/tezos-client-002-PsYLVpVv-commands.opam +++ b/src/proto_002_PsYLVpVv/lib_client_commands/tezos-client-002-PsYLVpVv-commands.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-002-PsYLVpVv" diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune-project b/src/proto_002_PsYLVpVv/lib_protocol/dune-project index f64c6de01..179051d06 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune-project +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-002-PsYLVpVv) diff --git a/src/proto_002_PsYLVpVv/lib_protocol/dune.inc b/src/proto_002_PsYLVpVv/lib_protocol/dune.inc index 59e69b874..7f756a659 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/dune.inc +++ b/src/proto_002_PsYLVpVv/lib_protocol/dune.inc @@ -372,8 +372,8 @@ include Tezos_raw_protocol_002_PsYLVpVv.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps misc.mli misc.ml storage_description.mli storage_description.ml @@ -445,11 +445,13 @@ include Tezos_raw_protocol_002_PsYLVpVv.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_002_PsYLVpVv.objs/native/tezos_protocol_002_PsYLVpVv.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_002_PsYLVpVv.objs/native/tezos_protocol_002_PsYLVpVv.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-002-PsYLVpVv) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_002_PsYLVpVv/lib_protocol/tezos-embedded-protocol-002-PsYLVpVv.opam b/src/proto_002_PsYLVpVv/lib_protocol/tezos-embedded-protocol-002-PsYLVpVv.opam index 8198d552f..31a413afe 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/tezos-embedded-protocol-002-PsYLVpVv.opam +++ b/src/proto_002_PsYLVpVv/lib_protocol/tezos-embedded-protocol-002-PsYLVpVv.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-002-PsYLVpVv" "tezos-protocol-compiler" diff --git a/src/proto_002_PsYLVpVv/lib_protocol/tezos-protocol-002-PsYLVpVv.opam b/src/proto_002_PsYLVpVv/lib_protocol/tezos-protocol-002-PsYLVpVv.opam index 375828edc..0298e524e 100644 --- a/src/proto_002_PsYLVpVv/lib_protocol/tezos-protocol-002-PsYLVpVv.opam +++ b/src/proto_002_PsYLVpVv/lib_protocol/tezos-protocol-002-PsYLVpVv.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-compiler" "alcotest-lwt" { with-test & >= "1.1.0" } diff --git a/src/proto_003_PsddFKi3/lib_client/dune b/src/proto_003_PsddFKi3/lib_client/dune index 33e6c1dac..941ecf755 100644 --- a/src/proto_003_PsddFKi3/lib_client/dune +++ b/src/proto_003_PsddFKi3/lib_client/dune @@ -13,7 +13,7 @@ -open Tezos_protocol_003_PsddFKi3 -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_003_PsddFKi3/lib_client/dune-project b/src/proto_003_PsddFKi3/lib_client/dune-project index 4aeed63f7..f811a0cd2 100644 --- a/src/proto_003_PsddFKi3/lib_client/dune-project +++ b/src/proto_003_PsddFKi3/lib_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-003-PsddFKi3) diff --git a/src/proto_003_PsddFKi3/lib_client/tezos-client-003-PsddFKi3.opam b/src/proto_003_PsddFKi3/lib_client/tezos-client-003-PsddFKi3.opam index 05f75e615..49b506e1f 100644 --- a/src/proto_003_PsddFKi3/lib_client/tezos-client-003-PsddFKi3.opam +++ b/src/proto_003_PsddFKi3/lib_client/tezos-client-003-PsddFKi3.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-003-PsddFKi3" diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune b/src/proto_003_PsddFKi3/lib_client_commands/dune index ccee3cb36..0abf1035c 100644 --- a/src/proto_003_PsddFKi3/lib_client_commands/dune +++ b/src/proto_003_PsddFKi3/lib_client_commands/dune @@ -43,7 +43,7 @@ -open Tezos_client_003_PsddFKi3_commands -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune-project b/src/proto_003_PsddFKi3/lib_client_commands/dune-project index 0e0e878cd..e837143cb 100644 --- a/src/proto_003_PsddFKi3/lib_client_commands/dune-project +++ b/src/proto_003_PsddFKi3/lib_client_commands/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-003-PsddFKi3-commands) diff --git a/src/proto_003_PsddFKi3/lib_client_commands/tezos-client-003-PsddFKi3-commands.opam b/src/proto_003_PsddFKi3/lib_client_commands/tezos-client-003-PsddFKi3-commands.opam index b78a80a87..32fdb53ed 100644 --- a/src/proto_003_PsddFKi3/lib_client_commands/tezos-client-003-PsddFKi3-commands.opam +++ b/src/proto_003_PsddFKi3/lib_client_commands/tezos-client-003-PsddFKi3-commands.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-003-PsddFKi3" diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune-project b/src/proto_003_PsddFKi3/lib_protocol/dune-project index 7fecc82cd..a709182c3 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune-project +++ b/src/proto_003_PsddFKi3/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-003-PsddFKi3) diff --git a/src/proto_003_PsddFKi3/lib_protocol/dune.inc b/src/proto_003_PsddFKi3/lib_protocol/dune.inc index 47c0f6cb5..2e75f5942 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/dune.inc +++ b/src/proto_003_PsddFKi3/lib_protocol/dune.inc @@ -376,8 +376,8 @@ include Tezos_raw_protocol_003_PsddFKi3.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps misc.mli misc.ml storage_description.mli storage_description.ml @@ -450,11 +450,13 @@ include Tezos_raw_protocol_003_PsddFKi3.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_003_PsddFKi3.objs/native/tezos_protocol_003_PsddFKi3.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_003_PsddFKi3.objs/native/tezos_protocol_003_PsddFKi3.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-003-PsddFKi3) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_003_PsddFKi3/lib_protocol/tezos-embedded-protocol-003-PsddFKi3.opam b/src/proto_003_PsddFKi3/lib_protocol/tezos-embedded-protocol-003-PsddFKi3.opam index 07bf7bb16..bc88bef78 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/tezos-embedded-protocol-003-PsddFKi3.opam +++ b/src/proto_003_PsddFKi3/lib_protocol/tezos-embedded-protocol-003-PsddFKi3.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-003-PsddFKi3" "tezos-protocol-compiler" diff --git a/src/proto_003_PsddFKi3/lib_protocol/tezos-protocol-003-PsddFKi3.opam b/src/proto_003_PsddFKi3/lib_protocol/tezos-protocol-003-PsddFKi3.opam index f949d3459..da7f7bae5 100644 --- a/src/proto_003_PsddFKi3/lib_protocol/tezos-protocol-003-PsddFKi3.opam +++ b/src/proto_003_PsddFKi3/lib_protocol/tezos-protocol-003-PsddFKi3.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-compiler" "alcotest-lwt" { with-test & >= "1.1.0" } diff --git a/src/proto_004_Pt24m4xi/lib_client/dune b/src/proto_004_Pt24m4xi/lib_client/dune index ccbe89c7f..c69dc71b6 100644 --- a/src/proto_004_Pt24m4xi/lib_client/dune +++ b/src/proto_004_Pt24m4xi/lib_client/dune @@ -14,7 +14,7 @@ -open Tezos_protocol_004_Pt24m4xi -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_004_Pt24m4xi/lib_client/dune-project b/src/proto_004_Pt24m4xi/lib_client/dune-project index 20dbc39f9..68cdb1acc 100644 --- a/src/proto_004_Pt24m4xi/lib_client/dune-project +++ b/src/proto_004_Pt24m4xi/lib_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-004-Pt24m4xi) diff --git a/src/proto_004_Pt24m4xi/lib_client/tezos-client-004-Pt24m4xi.opam b/src/proto_004_Pt24m4xi/lib_client/tezos-client-004-Pt24m4xi.opam index 802af1765..fd7703c3c 100644 --- a/src/proto_004_Pt24m4xi/lib_client/tezos-client-004-Pt24m4xi.opam +++ b/src/proto_004_Pt24m4xi/lib_client/tezos-client-004-Pt24m4xi.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-004-Pt24m4xi" diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune b/src/proto_004_Pt24m4xi/lib_client_commands/dune index d4ea809d7..5437259ff 100644 --- a/src/proto_004_Pt24m4xi/lib_client_commands/dune +++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune @@ -43,7 +43,7 @@ -open Tezos_client_004_Pt24m4xi_commands -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune-project b/src/proto_004_Pt24m4xi/lib_client_commands/dune-project index 5c2c20f6a..d5396a17a 100644 --- a/src/proto_004_Pt24m4xi/lib_client_commands/dune-project +++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-004-Pt24m4xi-commands) diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/tezos-client-004-Pt24m4xi-commands.opam b/src/proto_004_Pt24m4xi/lib_client_commands/tezos-client-004-Pt24m4xi-commands.opam index 0a17fbf43..f57ce005e 100644 --- a/src/proto_004_Pt24m4xi/lib_client_commands/tezos-client-004-Pt24m4xi-commands.opam +++ b/src/proto_004_Pt24m4xi/lib_client_commands/tezos-client-004-Pt24m4xi-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-004-Pt24m4xi" diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune-project b/src/proto_004_Pt24m4xi/lib_protocol/dune-project index 76d097ad5..8d15147fe 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune-project +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-004-Pt24m4xi) diff --git a/src/proto_004_Pt24m4xi/lib_protocol/dune.inc b/src/proto_004_Pt24m4xi/lib_protocol/dune.inc index f7177c3ca..7d113ef85 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/dune.inc +++ b/src/proto_004_Pt24m4xi/lib_protocol/dune.inc @@ -376,8 +376,8 @@ include Tezos_raw_protocol_004_Pt24m4xi.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps misc.mli misc.ml storage_description.mli storage_description.ml @@ -450,11 +450,13 @@ include Tezos_raw_protocol_004_Pt24m4xi.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_004_Pt24m4xi.objs/native/tezos_protocol_004_Pt24m4xi.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_004_Pt24m4xi.objs/native/tezos_protocol_004_Pt24m4xi.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-004-Pt24m4xi) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_004_Pt24m4xi/lib_protocol/tezos-embedded-protocol-004-Pt24m4xi.opam b/src/proto_004_Pt24m4xi/lib_protocol/tezos-embedded-protocol-004-Pt24m4xi.opam index d5675dd9f..8a239e7f3 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/tezos-embedded-protocol-004-Pt24m4xi.opam +++ b/src/proto_004_Pt24m4xi/lib_protocol/tezos-embedded-protocol-004-Pt24m4xi.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-004-Pt24m4xi" "tezos-protocol-compiler" diff --git a/src/proto_004_Pt24m4xi/lib_protocol/tezos-protocol-004-Pt24m4xi.opam b/src/proto_004_Pt24m4xi/lib_protocol/tezos-protocol-004-Pt24m4xi.opam index b0230019b..8a2c33396 100644 --- a/src/proto_004_Pt24m4xi/lib_protocol/tezos-protocol-004-Pt24m4xi.opam +++ b/src/proto_004_Pt24m4xi/lib_protocol/tezos-protocol-004-Pt24m4xi.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-compiler" ] diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune-project b/src/proto_005_PsBABY5H/lib_protocol/dune-project index 22313c263..12ae90ab3 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune-project +++ b/src/proto_005_PsBABY5H/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-005-PsBABY5H) diff --git a/src/proto_005_PsBABY5H/lib_protocol/dune.inc b/src/proto_005_PsBABY5H/lib_protocol/dune.inc index c422c1d1d..ada00fe98 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/dune.inc +++ b/src/proto_005_PsBABY5H/lib_protocol/dune.inc @@ -380,8 +380,8 @@ include Tezos_raw_protocol_005_PsBABY5H.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps misc.mli misc.ml storage_description.mli storage_description.ml @@ -455,11 +455,13 @@ include Tezos_raw_protocol_005_PsBABY5H.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_005_PsBABY5H.objs/native/tezos_protocol_005_PsBABY5H.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_005_PsBABY5H.objs/native/tezos_protocol_005_PsBABY5H.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-005-PsBABY5H) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_005_PsBABY5H/lib_protocol/tezos-embedded-protocol-005-PsBABY5H.opam b/src/proto_005_PsBABY5H/lib_protocol/tezos-embedded-protocol-005-PsBABY5H.opam index 42ec5db36..bea5968b9 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/tezos-embedded-protocol-005-PsBABY5H.opam +++ b/src/proto_005_PsBABY5H/lib_protocol/tezos-embedded-protocol-005-PsBABY5H.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-005-PsBABY5H" "tezos-protocol-compiler" diff --git a/src/proto_005_PsBABY5H/lib_protocol/tezos-protocol-005-PsBABY5H.opam b/src/proto_005_PsBABY5H/lib_protocol/tezos-protocol-005-PsBABY5H.opam index 104614782..c168eee9b 100644 --- a/src/proto_005_PsBABY5H/lib_protocol/tezos-protocol-005-PsBABY5H.opam +++ b/src/proto_005_PsBABY5H/lib_protocol/tezos-protocol-005-PsBABY5H.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-compiler" ] diff --git a/src/proto_005_PsBabyM1/lib_client/dune b/src/proto_005_PsBabyM1/lib_client/dune index 7197eb32c..7ef713036 100644 --- a/src/proto_005_PsBabyM1/lib_client/dune +++ b/src/proto_005_PsBabyM1/lib_client/dune @@ -14,7 +14,7 @@ -open Tezos_protocol_005_PsBabyM1 -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_005_PsBabyM1/lib_client/dune-project b/src/proto_005_PsBabyM1/lib_client/dune-project index 9dd61d2ba..7b42adb05 100644 --- a/src/proto_005_PsBabyM1/lib_client/dune-project +++ b/src/proto_005_PsBabyM1/lib_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-005-PsBabyM1) diff --git a/src/proto_005_PsBabyM1/lib_client/tezos-client-005-PsBabyM1.opam b/src/proto_005_PsBabyM1/lib_client/tezos-client-005-PsBabyM1.opam index 04abac0b3..282cabc8b 100644 --- a/src/proto_005_PsBabyM1/lib_client/tezos-client-005-PsBabyM1.opam +++ b/src/proto_005_PsBabyM1/lib_client/tezos-client-005-PsBabyM1.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-005-PsBabyM1" diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune b/src/proto_005_PsBabyM1/lib_client_commands/dune index 872ea2cae..c48ac128f 100644 --- a/src/proto_005_PsBabyM1/lib_client_commands/dune +++ b/src/proto_005_PsBabyM1/lib_client_commands/dune @@ -43,7 +43,7 @@ -open Tezos_client_005_PsBabyM1_commands -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune-project b/src/proto_005_PsBabyM1/lib_client_commands/dune-project index 2076e642b..4bb8a82bb 100644 --- a/src/proto_005_PsBabyM1/lib_client_commands/dune-project +++ b/src/proto_005_PsBabyM1/lib_client_commands/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-005-PsBabyM1-commands) diff --git a/src/proto_005_PsBabyM1/lib_client_commands/tezos-client-005-PsBabyM1-commands.opam b/src/proto_005_PsBabyM1/lib_client_commands/tezos-client-005-PsBabyM1-commands.opam index fb5cf2dd6..9d871dcf7 100644 --- a/src/proto_005_PsBabyM1/lib_client_commands/tezos-client-005-PsBabyM1-commands.opam +++ b/src/proto_005_PsBabyM1/lib_client_commands/tezos-client-005-PsBabyM1-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-005-PsBabyM1" diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune-project b/src/proto_005_PsBabyM1/lib_protocol/dune-project index d4d600dc7..c2a4c18a1 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune-project +++ b/src/proto_005_PsBabyM1/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-005-PsBabyM1) diff --git a/src/proto_005_PsBabyM1/lib_protocol/dune.inc b/src/proto_005_PsBabyM1/lib_protocol/dune.inc index 45ee29f6e..261b0c7dc 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/dune.inc +++ b/src/proto_005_PsBabyM1/lib_protocol/dune.inc @@ -380,8 +380,8 @@ include Tezos_raw_protocol_005_PsBabyM1.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps misc.mli misc.ml storage_description.mli storage_description.ml @@ -455,11 +455,13 @@ include Tezos_raw_protocol_005_PsBabyM1.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_005_PsBabyM1.objs/native/tezos_protocol_005_PsBabyM1.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_005_PsBabyM1.objs/native/tezos_protocol_005_PsBabyM1.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-005-PsBabyM1) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_005_PsBabyM1/lib_protocol/tezos-embedded-protocol-005-PsBabyM1.opam b/src/proto_005_PsBabyM1/lib_protocol/tezos-embedded-protocol-005-PsBabyM1.opam index 63d907201..597c0d00a 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/tezos-embedded-protocol-005-PsBabyM1.opam +++ b/src/proto_005_PsBabyM1/lib_protocol/tezos-embedded-protocol-005-PsBabyM1.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-005-PsBabyM1" "tezos-protocol-compiler" diff --git a/src/proto_005_PsBabyM1/lib_protocol/tezos-protocol-005-PsBabyM1.opam b/src/proto_005_PsBabyM1/lib_protocol/tezos-protocol-005-PsBabyM1.opam index b0db76b91..93ae9634d 100644 --- a/src/proto_005_PsBabyM1/lib_protocol/tezos-protocol-005-PsBabyM1.opam +++ b/src/proto_005_PsBabyM1/lib_protocol/tezos-protocol-005-PsBabyM1.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-compiler" ] diff --git a/src/proto_006_PsCARTHA/bin_accuser/dune b/src/proto_006_PsCARTHA/bin_accuser/dune index e99ac8f95..a2aacd611 100644 --- a/src/proto_006_PsCARTHA/bin_accuser/dune +++ b/src/proto_006_PsCARTHA/bin_accuser/dune @@ -12,7 +12,7 @@ -open Tezos_stdlib_unix -open Tezos_client_base_unix))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_006_PsCARTHA/bin_accuser/dune-project b/src/proto_006_PsCARTHA/bin_accuser/dune-project index 93808523c..bad455566 100644 --- a/src/proto_006_PsCARTHA/bin_accuser/dune-project +++ b/src/proto_006_PsCARTHA/bin_accuser/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-accuser-006-PsCARTHA) diff --git a/src/proto_006_PsCARTHA/bin_accuser/tezos-accuser-006-PsCARTHA.opam b/src/proto_006_PsCARTHA/bin_accuser/tezos-accuser-006-PsCARTHA.opam index e5b257b76..9b91b7b3b 100644 --- a/src/proto_006_PsCARTHA/bin_accuser/tezos-accuser-006-PsCARTHA.opam +++ b/src/proto_006_PsCARTHA/bin_accuser/tezos-accuser-006-PsCARTHA.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-006-PsCARTHA" "tezos-client-commands" diff --git a/src/proto_006_PsCARTHA/bin_baker/dune b/src/proto_006_PsCARTHA/bin_baker/dune index d96ef4cde..90c152a3b 100644 --- a/src/proto_006_PsCARTHA/bin_baker/dune +++ b/src/proto_006_PsCARTHA/bin_baker/dune @@ -12,7 +12,7 @@ -open Tezos_stdlib_unix -open Tezos_client_base_unix))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_006_PsCARTHA/bin_baker/dune-project b/src/proto_006_PsCARTHA/bin_baker/dune-project index 6d5760923..d3740d850 100644 --- a/src/proto_006_PsCARTHA/bin_baker/dune-project +++ b/src/proto_006_PsCARTHA/bin_baker/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-baker-006-PsCARTHA) diff --git a/src/proto_006_PsCARTHA/bin_baker/tezos-baker-006-PsCARTHA.opam b/src/proto_006_PsCARTHA/bin_baker/tezos-baker-006-PsCARTHA.opam index b830a6b80..85bbbdb8e 100644 --- a/src/proto_006_PsCARTHA/bin_baker/tezos-baker-006-PsCARTHA.opam +++ b/src/proto_006_PsCARTHA/bin_baker/tezos-baker-006-PsCARTHA.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-006-PsCARTHA" "tezos-client-commands" diff --git a/src/proto_006_PsCARTHA/bin_endorser/dune b/src/proto_006_PsCARTHA/bin_endorser/dune index c675ab3c5..4c8ec1004 100644 --- a/src/proto_006_PsCARTHA/bin_endorser/dune +++ b/src/proto_006_PsCARTHA/bin_endorser/dune @@ -12,7 +12,7 @@ -open Tezos_stdlib_unix -open Tezos_client_base_unix))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_006_PsCARTHA/bin_endorser/dune-project b/src/proto_006_PsCARTHA/bin_endorser/dune-project index f2d96753f..9ab7f0229 100644 --- a/src/proto_006_PsCARTHA/bin_endorser/dune-project +++ b/src/proto_006_PsCARTHA/bin_endorser/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-endorser-006-PsCARTHA) diff --git a/src/proto_006_PsCARTHA/bin_endorser/tezos-endorser-006-PsCARTHA.opam b/src/proto_006_PsCARTHA/bin_endorser/tezos-endorser-006-PsCARTHA.opam index fd5648844..cd701f652 100644 --- a/src/proto_006_PsCARTHA/bin_endorser/tezos-endorser-006-PsCARTHA.opam +++ b/src/proto_006_PsCARTHA/bin_endorser/tezos-endorser-006-PsCARTHA.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-006-PsCARTHA" "tezos-client-commands" diff --git a/src/proto_006_PsCARTHA/lib_client/dune b/src/proto_006_PsCARTHA/lib_client/dune index e814c39cc..0d4001cad 100644 --- a/src/proto_006_PsCARTHA/lib_client/dune +++ b/src/proto_006_PsCARTHA/lib_client/dune @@ -16,7 +16,7 @@ -open Tezos_protocol_006_PsCARTHA -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_006_PsCARTHA/lib_client/dune-project b/src/proto_006_PsCARTHA/lib_client/dune-project index f642cfa59..a6f0cee76 100644 --- a/src/proto_006_PsCARTHA/lib_client/dune-project +++ b/src/proto_006_PsCARTHA/lib_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-006-PsCARTHA) diff --git a/src/proto_006_PsCARTHA/lib_client/test/dune b/src/proto_006_PsCARTHA/lib_client/test/dune index e8bde1a89..211d2fd91 100644 --- a/src/proto_006_PsCARTHA/lib_client/test/dune +++ b/src/proto_006_PsCARTHA/lib_client/test/dune @@ -11,20 +11,22 @@ -open Tezos_protocol_006_PsCARTHA))) -(alias -(name buildtest) -(deps test_michelson_v1_macros.exe)) +(rule +(alias buildtest) +(deps test_michelson_v1_macros.exe) +(action (progn))) -(alias -(name runtest_michelson_v1_macros) +(rule +(alias runtest_michelson_v1_macros) (action (run %{exe:test_michelson_v1_macros.exe}))) -(alias -(name runtest) +(rule +(alias runtest) (package tezos-client-006-PsCARTHA) -(deps (alias runtest_michelson_v1_macros))) +(deps (alias runtest_michelson_v1_macros)) +(action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_006_PsCARTHA/lib_client/tezos-client-006-PsCARTHA.opam b/src/proto_006_PsCARTHA/lib_client/tezos-client-006-PsCARTHA.opam index 1d9c60217..720ae933c 100644 --- a/src/proto_006_PsCARTHA/lib_client/tezos-client-006-PsCARTHA.opam +++ b/src/proto_006_PsCARTHA/lib_client/tezos-client-006-PsCARTHA.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-006-PsCARTHA" diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune b/src/proto_006_PsCARTHA/lib_client_commands/dune index 8852b1575..19b6ee98c 100644 --- a/src/proto_006_PsCARTHA/lib_client_commands/dune +++ b/src/proto_006_PsCARTHA/lib_client_commands/dune @@ -46,7 +46,7 @@ -open Tezos_client_006_PsCARTHA_commands -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune-project b/src/proto_006_PsCARTHA/lib_client_commands/dune-project index 72aa0c1ec..f7d6bd723 100644 --- a/src/proto_006_PsCARTHA/lib_client_commands/dune-project +++ b/src/proto_006_PsCARTHA/lib_client_commands/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-006-PsCARTHA-commands) diff --git a/src/proto_006_PsCARTHA/lib_client_commands/tezos-client-006-PsCARTHA-commands.opam b/src/proto_006_PsCARTHA/lib_client_commands/tezos-client-006-PsCARTHA-commands.opam index a07524771..ba3c1fe6b 100644 --- a/src/proto_006_PsCARTHA/lib_client_commands/tezos-client-006-PsCARTHA-commands.opam +++ b/src/proto_006_PsCARTHA/lib_client_commands/tezos-client-006-PsCARTHA-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-006-PsCARTHA" diff --git a/src/proto_006_PsCARTHA/lib_delegate/dune b/src/proto_006_PsCARTHA/lib_delegate/dune index c027d1447..801a7f4ad 100644 --- a/src/proto_006_PsCARTHA/lib_delegate/dune +++ b/src/proto_006_PsCARTHA/lib_delegate/dune @@ -78,7 +78,7 @@ -open Tezos_baking_006_PsCARTHA_commands -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_006_PsCARTHA/lib_delegate/dune-project b/src/proto_006_PsCARTHA/lib_delegate/dune-project index a01231621..81f71b1ba 100644 --- a/src/proto_006_PsCARTHA/lib_delegate/dune-project +++ b/src/proto_006_PsCARTHA/lib_delegate/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-accuser-006-PsCARTHA-commands) diff --git a/src/proto_006_PsCARTHA/lib_delegate/tezos-accuser-006-PsCARTHA-commands.opam b/src/proto_006_PsCARTHA/lib_delegate/tezos-accuser-006-PsCARTHA-commands.opam index c1cf3bfcd..7b91f0fd5 100644 --- a/src/proto_006_PsCARTHA/lib_delegate/tezos-accuser-006-PsCARTHA-commands.opam +++ b/src/proto_006_PsCARTHA/lib_delegate/tezos-accuser-006-PsCARTHA-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-006-PsCARTHA" diff --git a/src/proto_006_PsCARTHA/lib_delegate/tezos-baking-006-PsCARTHA-commands.opam b/src/proto_006_PsCARTHA/lib_delegate/tezos-baking-006-PsCARTHA-commands.opam index 7583e7f5e..cb1815ae4 100644 --- a/src/proto_006_PsCARTHA/lib_delegate/tezos-baking-006-PsCARTHA-commands.opam +++ b/src/proto_006_PsCARTHA/lib_delegate/tezos-baking-006-PsCARTHA-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-006-PsCARTHA" diff --git a/src/proto_006_PsCARTHA/lib_delegate/tezos-baking-006-PsCARTHA.opam b/src/proto_006_PsCARTHA/lib_delegate/tezos-baking-006-PsCARTHA.opam index 2272c0c9e..0d4b66bf0 100644 --- a/src/proto_006_PsCARTHA/lib_delegate/tezos-baking-006-PsCARTHA.opam +++ b/src/proto_006_PsCARTHA/lib_delegate/tezos-baking-006-PsCARTHA.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-version" "tezos-protocol-environment" diff --git a/src/proto_006_PsCARTHA/lib_delegate/tezos-endorser-006-PsCARTHA-commands.opam b/src/proto_006_PsCARTHA/lib_delegate/tezos-endorser-006-PsCARTHA-commands.opam index 4f189eb43..63ed3007b 100644 --- a/src/proto_006_PsCARTHA/lib_delegate/tezos-endorser-006-PsCARTHA-commands.opam +++ b/src/proto_006_PsCARTHA/lib_delegate/tezos-endorser-006-PsCARTHA-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-006-PsCARTHA" diff --git a/src/proto_006_PsCARTHA/lib_mempool/dune b/src/proto_006_PsCARTHA/lib_mempool/dune index 2f901611d..68612ec16 100644 --- a/src/proto_006_PsCARTHA/lib_mempool/dune +++ b/src/proto_006_PsCARTHA/lib_mempool/dune @@ -8,7 +8,7 @@ -open Tezos_embedded_protocol_006_PsCARTHA -open Tezos_protocol_006_PsCARTHA))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_006_PsCARTHA/lib_mempool/dune-project b/src/proto_006_PsCARTHA/lib_mempool/dune-project index b3d7308ca..f377ff258 100644 --- a/src/proto_006_PsCARTHA/lib_mempool/dune-project +++ b/src/proto_006_PsCARTHA/lib_mempool/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-mempool-006-PsCARTHA) diff --git a/src/proto_006_PsCARTHA/lib_mempool/tezos-mempool-006-PsCARTHA.opam b/src/proto_006_PsCARTHA/lib_mempool/tezos-mempool-006-PsCARTHA.opam index 1f5bd23a7..7db8c3484 100644 --- a/src/proto_006_PsCARTHA/lib_mempool/tezos-mempool-006-PsCARTHA.opam +++ b/src/proto_006_PsCARTHA/lib_mempool/tezos-mempool-006-PsCARTHA.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-embedded-protocol-006-PsCARTHA" "tezos-shell" diff --git a/src/proto_006_PsCARTHA/lib_parameters/dune b/src/proto_006_PsCARTHA/lib_parameters/dune index 2db13dc83..dcbe4213d 100644 --- a/src/proto_006_PsCARTHA/lib_parameters/dune +++ b/src/proto_006_PsCARTHA/lib_parameters/dune @@ -38,7 +38,7 @@ (section lib) (files sandbox-parameters.json test-parameters.json mainnet-parameters.json)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_006_PsCARTHA/lib_parameters/dune-project b/src/proto_006_PsCARTHA/lib_parameters/dune-project index 6e6688d7b..596a5f0a8 100644 --- a/src/proto_006_PsCARTHA/lib_parameters/dune-project +++ b/src/proto_006_PsCARTHA/lib_parameters/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-protocol-006-PsCARTHA-parameters) diff --git a/src/proto_006_PsCARTHA/lib_parameters/tezos-protocol-006-PsCARTHA-parameters.opam b/src/proto_006_PsCARTHA/lib_parameters/tezos-protocol-006-PsCARTHA-parameters.opam index 78f8250d5..cb39d8c4d 100644 --- a/src/proto_006_PsCARTHA/lib_parameters/tezos-protocol-006-PsCARTHA-parameters.opam +++ b/src/proto_006_PsCARTHA/lib_parameters/tezos-protocol-006-PsCARTHA-parameters.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-006-PsCARTHA" diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune-project b/src/proto_006_PsCARTHA/lib_protocol/dune-project index d011e9a22..4da647887 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune-project +++ b/src/proto_006_PsCARTHA/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-006-PsCARTHA) diff --git a/src/proto_006_PsCARTHA/lib_protocol/dune.inc b/src/proto_006_PsCARTHA/lib_protocol/dune.inc index 424d22b60..14282a708 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/dune.inc +++ b/src/proto_006_PsCARTHA/lib_protocol/dune.inc @@ -380,8 +380,8 @@ include Tezos_raw_protocol_006_PsCARTHA.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps misc.mli misc.ml storage_description.mli storage_description.ml @@ -455,11 +455,13 @@ include Tezos_raw_protocol_006_PsCARTHA.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_006_PsCARTHA.objs/native/tezos_protocol_006_PsCARTHA.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_006_PsCARTHA.objs/native/tezos_protocol_006_PsCARTHA.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-006-PsCARTHA) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_006_PsCARTHA/lib_protocol/test/dune b/src/proto_006_PsCARTHA/lib_protocol/test/dune index 82e3cfcf7..1cccdbf05 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/test/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/test/dune @@ -14,33 +14,35 @@ -open Tezos_006_PsCARTHA_test_helpers ))) -(alias - (name buildtest) +(rule + (alias buildtest) (package tezos-protocol-006-PsCARTHA-tests) - (deps main.exe)) + (deps main.exe) + (action (progn))) (rule (copy %{lib:tezos-protocol-006-PsCARTHA-parameters:test-parameters.json} protocol_parameters.json)) ; runs only the `Quick tests -(alias - (name runtest_proto_006_PsCARTHA) +(rule + (alias runtest_proto_006_PsCARTHA) (package tezos-protocol-006-PsCARTHA-tests) (action (run %{exe:main.exe} -v -q))) ; runs both `Quick and `Slow tests -(alias - (name runtest_slow) +(rule + (alias runtest_slow) (package tezos-protocol-006-PsCARTHA-tests) (action (run %{exe:main.exe} -v))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-006-PsCARTHA-tests) - (deps (alias runtest_proto_006_PsCARTHA))) + (deps (alias runtest_proto_006_PsCARTHA)) + (action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_006_PsCARTHA/lib_protocol/test/helpers/dune b/src/proto_006_PsCARTHA/lib_protocol/test/helpers/dune index c7471e00b..ec1eb414e 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/test/helpers/dune +++ b/src/proto_006_PsCARTHA/lib_protocol/test/helpers/dune @@ -13,7 +13,7 @@ -open Tezos_protocol_006_PsCARTHA -open Tezos_shell_services))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_006_PsCARTHA/lib_protocol/test/helpers/dune-project b/src/proto_006_PsCARTHA/lib_protocol/test/helpers/dune-project index d619f5ac3..62ef3519c 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/test/helpers/dune-project +++ b/src/proto_006_PsCARTHA/lib_protocol/test/helpers/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-006-PsCARTHA-test-helpers) diff --git a/src/proto_006_PsCARTHA/lib_protocol/test/helpers/tezos-006-PsCARTHA-test-helpers.opam b/src/proto_006_PsCARTHA/lib_protocol/test/helpers/tezos-006-PsCARTHA-test-helpers.opam index 7fd4ff12d..93e1f6eb8 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/test/helpers/tezos-006-PsCARTHA-test-helpers.opam +++ b/src/proto_006_PsCARTHA/lib_protocol/test/helpers/tezos-006-PsCARTHA-test-helpers.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.7" } + "dune" { >= "2.0" } "tezos-base" "tezos-stdlib-unix" "tezos-shell-services" diff --git a/src/proto_006_PsCARTHA/lib_protocol/tezos-embedded-protocol-006-PsCARTHA.opam b/src/proto_006_PsCARTHA/lib_protocol/tezos-embedded-protocol-006-PsCARTHA.opam index fa7d332cb..c81828751 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/tezos-embedded-protocol-006-PsCARTHA.opam +++ b/src/proto_006_PsCARTHA/lib_protocol/tezos-embedded-protocol-006-PsCARTHA.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-006-PsCARTHA" "tezos-protocol-compiler" diff --git a/src/proto_006_PsCARTHA/lib_protocol/tezos-protocol-006-PsCARTHA-tests.opam b/src/proto_006_PsCARTHA/lib_protocol/tezos-protocol-006-PsCARTHA-tests.opam index 4c432ee27..5e0215fa9 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/tezos-protocol-006-PsCARTHA-tests.opam +++ b/src/proto_006_PsCARTHA/lib_protocol/tezos-protocol-006-PsCARTHA-tests.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-compiler" "alcotest-lwt" { with-test & >= "1.1.0" } diff --git a/src/proto_006_PsCARTHA/lib_protocol/tezos-protocol-006-PsCARTHA.opam b/src/proto_006_PsCARTHA/lib_protocol/tezos-protocol-006-PsCARTHA.opam index 6aceca4f3..01a313326 100644 --- a/src/proto_006_PsCARTHA/lib_protocol/tezos-protocol-006-PsCARTHA.opam +++ b/src/proto_006_PsCARTHA/lib_protocol/tezos-protocol-006-PsCARTHA.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-compiler" ] diff --git a/src/proto_007_PsDELPH1/bin_accuser/dune b/src/proto_007_PsDELPH1/bin_accuser/dune index da3093f82..8fe05cdc3 100644 --- a/src/proto_007_PsDELPH1/bin_accuser/dune +++ b/src/proto_007_PsDELPH1/bin_accuser/dune @@ -12,7 +12,7 @@ -open Tezos_stdlib_unix -open Tezos_client_base_unix))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_007_PsDELPH1/bin_accuser/dune-project b/src/proto_007_PsDELPH1/bin_accuser/dune-project index c48e4ac90..464a475c1 100644 --- a/src/proto_007_PsDELPH1/bin_accuser/dune-project +++ b/src/proto_007_PsDELPH1/bin_accuser/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-accuser-alpha) diff --git a/src/proto_007_PsDELPH1/bin_accuser/tezos-accuser-007-PsDELPH1.opam b/src/proto_007_PsDELPH1/bin_accuser/tezos-accuser-007-PsDELPH1.opam index 2123fff19..ac5e5f35b 100644 --- a/src/proto_007_PsDELPH1/bin_accuser/tezos-accuser-007-PsDELPH1.opam +++ b/src/proto_007_PsDELPH1/bin_accuser/tezos-accuser-007-PsDELPH1.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-007-PsDELPH1" "tezos-client-commands" diff --git a/src/proto_007_PsDELPH1/bin_baker/dune b/src/proto_007_PsDELPH1/bin_baker/dune index 490b09f8c..8b39572e3 100644 --- a/src/proto_007_PsDELPH1/bin_baker/dune +++ b/src/proto_007_PsDELPH1/bin_baker/dune @@ -12,7 +12,7 @@ -open Tezos_stdlib_unix -open Tezos_client_base_unix))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_007_PsDELPH1/bin_baker/dune-project b/src/proto_007_PsDELPH1/bin_baker/dune-project index 40bcbc733..fd1816c8e 100644 --- a/src/proto_007_PsDELPH1/bin_baker/dune-project +++ b/src/proto_007_PsDELPH1/bin_baker/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-baker-alpha) diff --git a/src/proto_007_PsDELPH1/bin_baker/tezos-baker-007-PsDELPH1.opam b/src/proto_007_PsDELPH1/bin_baker/tezos-baker-007-PsDELPH1.opam index abf40b39a..ad460696f 100644 --- a/src/proto_007_PsDELPH1/bin_baker/tezos-baker-007-PsDELPH1.opam +++ b/src/proto_007_PsDELPH1/bin_baker/tezos-baker-007-PsDELPH1.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-007-PsDELPH1" "tezos-client-commands" diff --git a/src/proto_007_PsDELPH1/bin_endorser/dune b/src/proto_007_PsDELPH1/bin_endorser/dune index 074b4e006..049bd25a2 100644 --- a/src/proto_007_PsDELPH1/bin_endorser/dune +++ b/src/proto_007_PsDELPH1/bin_endorser/dune @@ -12,7 +12,7 @@ -open Tezos_stdlib_unix -open Tezos_client_base_unix))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_007_PsDELPH1/bin_endorser/dune-project b/src/proto_007_PsDELPH1/bin_endorser/dune-project index bf417f6ed..036de336a 100644 --- a/src/proto_007_PsDELPH1/bin_endorser/dune-project +++ b/src/proto_007_PsDELPH1/bin_endorser/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-endorser-alpha) diff --git a/src/proto_007_PsDELPH1/bin_endorser/tezos-endorser-007-PsDELPH1.opam b/src/proto_007_PsDELPH1/bin_endorser/tezos-endorser-007-PsDELPH1.opam index fee098b01..d94e0dda1 100644 --- a/src/proto_007_PsDELPH1/bin_endorser/tezos-endorser-007-PsDELPH1.opam +++ b/src/proto_007_PsDELPH1/bin_endorser/tezos-endorser-007-PsDELPH1.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-007-PsDELPH1" "tezos-client-commands" diff --git a/src/proto_007_PsDELPH1/lib_client/dune b/src/proto_007_PsDELPH1/lib_client/dune index 6fa8bf658..643fc9750 100644 --- a/src/proto_007_PsDELPH1/lib_client/dune +++ b/src/proto_007_PsDELPH1/lib_client/dune @@ -17,7 +17,7 @@ -open Tezos_protocol_007_PsDELPH1_parameters -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_007_PsDELPH1/lib_client/dune-project b/src/proto_007_PsDELPH1/lib_client/dune-project index 619a83b1e..890514c6f 100644 --- a/src/proto_007_PsDELPH1/lib_client/dune-project +++ b/src/proto_007_PsDELPH1/lib_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-alpha) diff --git a/src/proto_007_PsDELPH1/lib_client/test/dune b/src/proto_007_PsDELPH1/lib_client/test/dune index dfd0c137f..32b8605ae 100644 --- a/src/proto_007_PsDELPH1/lib_client/test/dune +++ b/src/proto_007_PsDELPH1/lib_client/test/dune @@ -11,20 +11,22 @@ -open Tezos_protocol_007_PsDELPH1))) -(alias -(name buildtest) -(deps test_michelson_v1_macros.exe)) +(rule +(alias buildtest) +(deps test_michelson_v1_macros.exe) +(action (progn))) -(alias -(name runtest_michelson_v1_macros) +(rule +(alias runtest_michelson_v1_macros) (action (run %{exe:test_michelson_v1_macros.exe}))) -(alias -(name runtest) +(rule +(alias runtest) (package tezos-client-007-PsDELPH1) -(deps (alias runtest_michelson_v1_macros))) +(deps (alias runtest_michelson_v1_macros)) +(action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_007_PsDELPH1/lib_client/tezos-client-007-PsDELPH1.opam b/src/proto_007_PsDELPH1/lib_client/tezos-client-007-PsDELPH1.opam index 83b1cf037..f3cecf4f9 100644 --- a/src/proto_007_PsDELPH1/lib_client/tezos-client-007-PsDELPH1.opam +++ b/src/proto_007_PsDELPH1/lib_client/tezos-client-007-PsDELPH1.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-007-PsDELPH1" diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune b/src/proto_007_PsDELPH1/lib_client_commands/dune index 308cc9131..34cdce290 100644 --- a/src/proto_007_PsDELPH1/lib_client_commands/dune +++ b/src/proto_007_PsDELPH1/lib_client_commands/dune @@ -46,7 +46,7 @@ -open Tezos_client_007_PsDELPH1_commands -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune-project b/src/proto_007_PsDELPH1/lib_client_commands/dune-project index 0b0e1a906..2cbeb8024 100644 --- a/src/proto_007_PsDELPH1/lib_client_commands/dune-project +++ b/src/proto_007_PsDELPH1/lib_client_commands/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-alpha-commands) diff --git a/src/proto_007_PsDELPH1/lib_client_commands/tezos-client-007-PsDELPH1-commands-registration.opam b/src/proto_007_PsDELPH1/lib_client_commands/tezos-client-007-PsDELPH1-commands-registration.opam index 6fc22c471..514e247c0 100644 --- a/src/proto_007_PsDELPH1/lib_client_commands/tezos-client-007-PsDELPH1-commands-registration.opam +++ b/src/proto_007_PsDELPH1/lib_client_commands/tezos-client-007-PsDELPH1-commands-registration.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-007-PsDELPH1" diff --git a/src/proto_007_PsDELPH1/lib_client_commands/tezos-client-007-PsDELPH1-commands.opam b/src/proto_007_PsDELPH1/lib_client_commands/tezos-client-007-PsDELPH1-commands.opam index 02f36add4..e4a55526e 100644 --- a/src/proto_007_PsDELPH1/lib_client_commands/tezos-client-007-PsDELPH1-commands.opam +++ b/src/proto_007_PsDELPH1/lib_client_commands/tezos-client-007-PsDELPH1-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-007-PsDELPH1" diff --git a/src/proto_007_PsDELPH1/lib_delegate/dune b/src/proto_007_PsDELPH1/lib_delegate/dune index aec26614d..c6079ae60 100644 --- a/src/proto_007_PsDELPH1/lib_delegate/dune +++ b/src/proto_007_PsDELPH1/lib_delegate/dune @@ -79,7 +79,7 @@ -open Tezos_baking_007_PsDELPH1_commands -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_007_PsDELPH1/lib_delegate/dune-project b/src/proto_007_PsDELPH1/lib_delegate/dune-project index 9812f1aed..b20f594e4 100644 --- a/src/proto_007_PsDELPH1/lib_delegate/dune-project +++ b/src/proto_007_PsDELPH1/lib_delegate/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-accuser-alpha-commands) diff --git a/src/proto_007_PsDELPH1/lib_delegate/tezos-accuser-007-PsDELPH1-commands.opam b/src/proto_007_PsDELPH1/lib_delegate/tezos-accuser-007-PsDELPH1-commands.opam index 3736c80ec..c89d4f224 100644 --- a/src/proto_007_PsDELPH1/lib_delegate/tezos-accuser-007-PsDELPH1-commands.opam +++ b/src/proto_007_PsDELPH1/lib_delegate/tezos-accuser-007-PsDELPH1-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-007-PsDELPH1" diff --git a/src/proto_007_PsDELPH1/lib_delegate/tezos-baking-007-PsDELPH1-commands.opam b/src/proto_007_PsDELPH1/lib_delegate/tezos-baking-007-PsDELPH1-commands.opam index 6e42ca338..3b2f6f9d7 100644 --- a/src/proto_007_PsDELPH1/lib_delegate/tezos-baking-007-PsDELPH1-commands.opam +++ b/src/proto_007_PsDELPH1/lib_delegate/tezos-baking-007-PsDELPH1-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-007-PsDELPH1" diff --git a/src/proto_007_PsDELPH1/lib_delegate/tezos-baking-007-PsDELPH1.opam b/src/proto_007_PsDELPH1/lib_delegate/tezos-baking-007-PsDELPH1.opam index 446782533..4d3214dcf 100644 --- a/src/proto_007_PsDELPH1/lib_delegate/tezos-baking-007-PsDELPH1.opam +++ b/src/proto_007_PsDELPH1/lib_delegate/tezos-baking-007-PsDELPH1.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-version" "tezos-protocol-environment" diff --git a/src/proto_007_PsDELPH1/lib_delegate/tezos-endorser-007-PsDELPH1-commands.opam b/src/proto_007_PsDELPH1/lib_delegate/tezos-endorser-007-PsDELPH1-commands.opam index 7b916b0fc..4c4caa998 100644 --- a/src/proto_007_PsDELPH1/lib_delegate/tezos-endorser-007-PsDELPH1-commands.opam +++ b/src/proto_007_PsDELPH1/lib_delegate/tezos-endorser-007-PsDELPH1-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-007-PsDELPH1" diff --git a/src/proto_007_PsDELPH1/lib_mempool/dune b/src/proto_007_PsDELPH1/lib_mempool/dune index f04fedd09..8ac964a1f 100644 --- a/src/proto_007_PsDELPH1/lib_mempool/dune +++ b/src/proto_007_PsDELPH1/lib_mempool/dune @@ -8,7 +8,7 @@ -open Tezos_embedded_protocol_007_PsDELPH1 -open Tezos_protocol_007_PsDELPH1))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_007_PsDELPH1/lib_mempool/dune-project b/src/proto_007_PsDELPH1/lib_mempool/dune-project index 023fa57d2..bc94cade5 100644 --- a/src/proto_007_PsDELPH1/lib_mempool/dune-project +++ b/src/proto_007_PsDELPH1/lib_mempool/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-mempool-alpha) diff --git a/src/proto_007_PsDELPH1/lib_mempool/tezos-mempool-007-PsDELPH1.opam b/src/proto_007_PsDELPH1/lib_mempool/tezos-mempool-007-PsDELPH1.opam index 2dab34ba2..ec2d941d5 100644 --- a/src/proto_007_PsDELPH1/lib_mempool/tezos-mempool-007-PsDELPH1.opam +++ b/src/proto_007_PsDELPH1/lib_mempool/tezos-mempool-007-PsDELPH1.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-embedded-protocol-007-PsDELPH1" "tezos-shell" diff --git a/src/proto_007_PsDELPH1/lib_parameters/dune b/src/proto_007_PsDELPH1/lib_parameters/dune index f9f92726d..f9fefc3b5 100644 --- a/src/proto_007_PsDELPH1/lib_parameters/dune +++ b/src/proto_007_PsDELPH1/lib_parameters/dune @@ -38,7 +38,7 @@ (section lib) (files sandbox-parameters.json test-parameters.json mainnet-parameters.json)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_007_PsDELPH1/lib_parameters/dune-project b/src/proto_007_PsDELPH1/lib_parameters/dune-project index decc024c4..8b12287e8 100644 --- a/src/proto_007_PsDELPH1/lib_parameters/dune-project +++ b/src/proto_007_PsDELPH1/lib_parameters/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-protocol-alpha-parameters) diff --git a/src/proto_007_PsDELPH1/lib_parameters/tezos-protocol-007-PsDELPH1-parameters.opam b/src/proto_007_PsDELPH1/lib_parameters/tezos-protocol-007-PsDELPH1-parameters.opam index 048253221..25504870c 100644 --- a/src/proto_007_PsDELPH1/lib_parameters/tezos-protocol-007-PsDELPH1-parameters.opam +++ b/src/proto_007_PsDELPH1/lib_parameters/tezos-protocol-007-PsDELPH1-parameters.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-007-PsDELPH1" diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune-project b/src/proto_007_PsDELPH1/lib_protocol/dune-project index 105cd35b3..b3830b3c7 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune-project +++ b/src/proto_007_PsDELPH1/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-007-PsDELPH1) diff --git a/src/proto_007_PsDELPH1/lib_protocol/dune.inc b/src/proto_007_PsDELPH1/lib_protocol/dune.inc index 09ff9d1d1..01f3cb643 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/dune.inc +++ b/src/proto_007_PsDELPH1/lib_protocol/dune.inc @@ -388,8 +388,8 @@ include Tezos_raw_protocol_007_PsDELPH1.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps misc.mli misc.ml storage_description.mli storage_description.ml @@ -465,11 +465,13 @@ include Tezos_raw_protocol_007_PsDELPH1.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_007_PsDELPH1.objs/native/tezos_protocol_007_PsDELPH1.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_007_PsDELPH1.objs/native/tezos_protocol_007_PsDELPH1.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-007-PsDELPH1) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_007_PsDELPH1/lib_protocol/test/dune b/src/proto_007_PsDELPH1/lib_protocol/test/dune index 1725d6f7e..2b633db9a 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/test/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/test/dune @@ -17,35 +17,37 @@ -open Tezos_007_PsDELPH1_test_helpers -open Tezos_test_services))) -(alias - (name buildtest) +(rule + (alias buildtest) (package tezos-protocol-007-PsDELPH1-tests) - (deps main.exe)) + (deps main.exe) + (action (progn))) (rule (copy %{lib:tezos-protocol-007-PsDELPH1-parameters:test-parameters.json} protocol_parameters.json)) ; runs only the `Quick tests -(alias - (name runtest_proto_007_PsDELPH1) +(rule + (alias runtest_proto_007_PsDELPH1) (deps contracts/big_interpreter_stack.tz) (package tezos-protocol-007-PsDELPH1-tests) (action (run %{exe:main.exe} -v -q))) ; runs both `Quick and `Slow tests -(alias - (name runtest_slow) +(rule + (alias runtest_slow) (deps contracts/big_interpreter_stack.tz) (package tezos-protocol-007-PsDELPH1-tests) (action (run %{exe:main.exe} -v))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-007-PsDELPH1-tests) - (deps (alias runtest_proto_007_PsDELPH1))) + (deps (alias runtest_proto_007_PsDELPH1)) + (action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_007_PsDELPH1/lib_protocol/test/helpers/dune b/src/proto_007_PsDELPH1/lib_protocol/test/helpers/dune index 05f3abdf1..8e5444ba3 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/test/helpers/dune +++ b/src/proto_007_PsDELPH1/lib_protocol/test/helpers/dune @@ -17,7 +17,7 @@ -open Tezos_protocol_environment_007_PsDELPH1 -open Tezos_shell_services))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_007_PsDELPH1/lib_protocol/test/helpers/dune-project b/src/proto_007_PsDELPH1/lib_protocol/test/helpers/dune-project index 6c744c884..cbae350d0 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/test/helpers/dune-project +++ b/src/proto_007_PsDELPH1/lib_protocol/test/helpers/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-alpha-test-helpers) diff --git a/src/proto_007_PsDELPH1/lib_protocol/test/helpers/tezos-007-PsDELPH1-test-helpers.opam b/src/proto_007_PsDELPH1/lib_protocol/test/helpers/tezos-007-PsDELPH1-test-helpers.opam index 8cae763ca..2b40d7952 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/test/helpers/tezos-007-PsDELPH1-test-helpers.opam +++ b/src/proto_007_PsDELPH1/lib_protocol/test/helpers/tezos-007-PsDELPH1-test-helpers.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.7" } + "dune" { >= "2.0" } "tezos-base" "tezos-stdlib-unix" "tezos-shell-services" diff --git a/src/proto_007_PsDELPH1/lib_protocol/tezos-embedded-protocol-007-PsDELPH1.opam b/src/proto_007_PsDELPH1/lib_protocol/tezos-embedded-protocol-007-PsDELPH1.opam index 9ad9208d6..c117be302 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/tezos-embedded-protocol-007-PsDELPH1.opam +++ b/src/proto_007_PsDELPH1/lib_protocol/tezos-embedded-protocol-007-PsDELPH1.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-007-PsDELPH1" "tezos-protocol-compiler" diff --git a/src/proto_007_PsDELPH1/lib_protocol/tezos-protocol-007-PsDELPH1-tests.opam b/src/proto_007_PsDELPH1/lib_protocol/tezos-protocol-007-PsDELPH1-tests.opam index b83ac455a..7fcbd48d3 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/tezos-protocol-007-PsDELPH1-tests.opam +++ b/src/proto_007_PsDELPH1/lib_protocol/tezos-protocol-007-PsDELPH1-tests.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-compiler" "alcotest-lwt" { with-test & >= "1.1.0" } diff --git a/src/proto_007_PsDELPH1/lib_protocol/tezos-protocol-007-PsDELPH1.opam b/src/proto_007_PsDELPH1/lib_protocol/tezos-protocol-007-PsDELPH1.opam index b632e1b1b..b6dd1bfe1 100644 --- a/src/proto_007_PsDELPH1/lib_protocol/tezos-protocol-007-PsDELPH1.opam +++ b/src/proto_007_PsDELPH1/lib_protocol/tezos-protocol-007-PsDELPH1.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-compiler" ] diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index 54391bc3b..ee20d869a 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -12,7 +12,7 @@ -open Tezos_stdlib_unix -open Tezos_client_base_unix))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_alpha/bin_accuser/dune-project b/src/proto_alpha/bin_accuser/dune-project index c48e4ac90..464a475c1 100644 --- a/src/proto_alpha/bin_accuser/dune-project +++ b/src/proto_alpha/bin_accuser/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-accuser-alpha) diff --git a/src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam b/src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam index d6f301dd5..e0277ea73 100644 --- a/src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam +++ b/src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-alpha" "tezos-client-commands" diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index d3a0163bb..5931e5c99 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -12,7 +12,7 @@ -open Tezos_stdlib_unix -open Tezos_client_base_unix))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_alpha/bin_baker/dune-project b/src/proto_alpha/bin_baker/dune-project index 40bcbc733..fd1816c8e 100644 --- a/src/proto_alpha/bin_baker/dune-project +++ b/src/proto_alpha/bin_baker/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-baker-alpha) diff --git a/src/proto_alpha/bin_baker/tezos-baker-alpha.opam b/src/proto_alpha/bin_baker/tezos-baker-alpha.opam index 3806b918c..5a014decb 100644 --- a/src/proto_alpha/bin_baker/tezos-baker-alpha.opam +++ b/src/proto_alpha/bin_baker/tezos-baker-alpha.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-alpha" "tezos-client-commands" diff --git a/src/proto_alpha/bin_endorser/dune b/src/proto_alpha/bin_endorser/dune index 2d7d83251..e822ec9a1 100644 --- a/src/proto_alpha/bin_endorser/dune +++ b/src/proto_alpha/bin_endorser/dune @@ -12,7 +12,7 @@ -open Tezos_stdlib_unix -open Tezos_client_base_unix))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_alpha/bin_endorser/dune-project b/src/proto_alpha/bin_endorser/dune-project index bf417f6ed..036de336a 100644 --- a/src/proto_alpha/bin_endorser/dune-project +++ b/src/proto_alpha/bin_endorser/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-endorser-alpha) diff --git a/src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam b/src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam index e487ed76e..289d7fdc0 100644 --- a/src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam +++ b/src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-client-alpha" "tezos-client-commands" diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index 751176a0b..07adf159b 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -17,7 +17,7 @@ -open Tezos_protocol_alpha_parameters -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_alpha/lib_client/dune-project b/src/proto_alpha/lib_client/dune-project index 619a83b1e..890514c6f 100644 --- a/src/proto_alpha/lib_client/dune-project +++ b/src/proto_alpha/lib_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-alpha) diff --git a/src/proto_alpha/lib_client/test/dune b/src/proto_alpha/lib_client/test/dune index 887a7f037..3d07b36d2 100644 --- a/src/proto_alpha/lib_client/test/dune +++ b/src/proto_alpha/lib_client/test/dune @@ -11,20 +11,22 @@ -open Tezos_protocol_alpha))) -(alias -(name buildtest) -(deps test_michelson_v1_macros.exe)) +(rule +(alias buildtest) +(deps test_michelson_v1_macros.exe) +(action (progn))) -(alias -(name runtest_michelson_v1_macros) +(rule +(alias runtest_michelson_v1_macros) (action (run %{exe:test_michelson_v1_macros.exe}))) -(alias -(name runtest) +(rule +(alias runtest) (package tezos-client-alpha) -(deps (alias runtest_michelson_v1_macros))) +(deps (alias runtest_michelson_v1_macros)) +(action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_alpha/lib_client/tezos-client-alpha.opam b/src/proto_alpha/lib_client/tezos-client-alpha.opam index a77295ddc..0858a8d28 100644 --- a/src/proto_alpha/lib_client/tezos-client-alpha.opam +++ b/src/proto_alpha/lib_client/tezos-client-alpha.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune index 366147171..85029be48 100644 --- a/src/proto_alpha/lib_client_commands/dune +++ b/src/proto_alpha/lib_client_commands/dune @@ -46,7 +46,7 @@ -open Tezos_client_alpha_commands -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_alpha/lib_client_commands/dune-project b/src/proto_alpha/lib_client_commands/dune-project index 0b0e1a906..2cbeb8024 100644 --- a/src/proto_alpha/lib_client_commands/dune-project +++ b/src/proto_alpha/lib_client_commands/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-alpha-commands) diff --git a/src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam b/src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam index 3776436b6..a4804e1ed 100644 --- a/src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam +++ b/src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune index 3da5958a3..24fdbfc90 100644 --- a/src/proto_alpha/lib_delegate/dune +++ b/src/proto_alpha/lib_delegate/dune @@ -79,7 +79,7 @@ -open Tezos_baking_alpha_commands -open Tezos_rpc))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_alpha/lib_delegate/dune-project b/src/proto_alpha/lib_delegate/dune-project index 9812f1aed..b20f594e4 100644 --- a/src/proto_alpha/lib_delegate/dune-project +++ b/src/proto_alpha/lib_delegate/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-accuser-alpha-commands) diff --git a/src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam b/src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam index 4a051e4b1..717298271 100644 --- a/src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam +++ b/src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" diff --git a/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam b/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam index 2ddf99b23..8f36d3270 100644 --- a/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam +++ b/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" diff --git a/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam b/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam index f50db9565..2cf6c3e61 100644 --- a/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam +++ b/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-version" "tezos-protocol-environment" diff --git a/src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam b/src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam index a03a73ce5..7dc7f19d0 100644 --- a/src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam +++ b/src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" diff --git a/src/proto_alpha/lib_mempool/dune b/src/proto_alpha/lib_mempool/dune index 51e9d1995..8b07c25bf 100644 --- a/src/proto_alpha/lib_mempool/dune +++ b/src/proto_alpha/lib_mempool/dune @@ -8,7 +8,7 @@ -open Tezos_embedded_protocol_alpha -open Tezos_protocol_alpha))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_alpha/lib_mempool/dune-project b/src/proto_alpha/lib_mempool/dune-project index 023fa57d2..bc94cade5 100644 --- a/src/proto_alpha/lib_mempool/dune-project +++ b/src/proto_alpha/lib_mempool/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-mempool-alpha) diff --git a/src/proto_alpha/lib_mempool/tezos-mempool-alpha.opam b/src/proto_alpha/lib_mempool/tezos-mempool-alpha.opam index d93dda42d..d21baeedd 100644 --- a/src/proto_alpha/lib_mempool/tezos-mempool-alpha.opam +++ b/src/proto_alpha/lib_mempool/tezos-mempool-alpha.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-embedded-protocol-alpha" "tezos-shell" diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune index b2c277a02..590563d80 100644 --- a/src/proto_alpha/lib_parameters/dune +++ b/src/proto_alpha/lib_parameters/dune @@ -38,7 +38,7 @@ (section lib) (files sandbox-parameters.json test-parameters.json mainnet-parameters.json)) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_alpha/lib_parameters/dune-project b/src/proto_alpha/lib_parameters/dune-project index decc024c4..8b12287e8 100644 --- a/src/proto_alpha/lib_parameters/dune-project +++ b/src/proto_alpha/lib_parameters/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-protocol-alpha-parameters) diff --git a/src/proto_alpha/lib_parameters/tezos-protocol-alpha-parameters.opam b/src/proto_alpha/lib_parameters/tezos-protocol-alpha-parameters.opam index ebeb43254..03bd643ed 100644 --- a/src/proto_alpha/lib_parameters/tezos-protocol-alpha-parameters.opam +++ b/src/proto_alpha/lib_parameters/tezos-protocol-alpha-parameters.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" diff --git a/src/proto_alpha/lib_protocol/dune-project b/src/proto_alpha/lib_protocol/dune-project index 588d5d99d..99815f324 100644 --- a/src/proto_alpha/lib_protocol/dune-project +++ b/src/proto_alpha/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-alpha) diff --git a/src/proto_alpha/lib_protocol/dune.inc b/src/proto_alpha/lib_protocol/dune.inc index 69cd18e9a..6e35af883 100644 --- a/src/proto_alpha/lib_protocol/dune.inc +++ b/src/proto_alpha/lib_protocol/dune.inc @@ -380,8 +380,8 @@ include Tezos_raw_protocol_alpha.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps misc.mli misc.ml storage_description.mli storage_description.ml @@ -455,11 +455,13 @@ include Tezos_raw_protocol_alpha.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} -no-hash-check .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_alpha.objs/native/tezos_protocol_alpha.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_alpha.objs/native/tezos_protocol_alpha.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-alpha) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_alpha/lib_protocol/test/dune b/src/proto_alpha/lib_protocol/test/dune index 79dddcf9c..3d3e92ed0 100644 --- a/src/proto_alpha/lib_protocol/test/dune +++ b/src/proto_alpha/lib_protocol/test/dune @@ -17,33 +17,35 @@ -open Tezos_alpha_test_helpers -open Tezos_test_services))) -(alias - (name buildtest) +(rule + (alias buildtest) (package tezos-protocol-alpha-tests) - (deps main.exe)) + (deps main.exe) + (action (progn))) (rule (copy %{lib:tezos-protocol-alpha-parameters:test-parameters.json} protocol_parameters.json)) ; runs only the `Quick tests -(alias - (name runtest_proto_alpha) +(rule + (alias runtest_proto_alpha) (package tezos-protocol-alpha-tests) (action (run %{exe:main.exe} -v -q))) ; runs both `Quick and `Slow tests -(alias - (name runtest_slow) +(rule + (alias runtest_slow) (package tezos-protocol-alpha-tests) (action (run %{exe:main.exe} -v))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-alpha-tests) - (deps (alias runtest_proto_alpha))) + (deps (alias runtest_proto_alpha)) + (action (progn))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune b/src/proto_alpha/lib_protocol/test/helpers/dune index d9bae2932..9787a0d2e 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dune +++ b/src/proto_alpha/lib_protocol/test/helpers/dune @@ -17,7 +17,7 @@ -open Tezos_protocol_environment_alpha -open Tezos_shell_services))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{lib:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_alpha/lib_protocol/test/helpers/dune-project b/src/proto_alpha/lib_protocol/test/helpers/dune-project index 6c744c884..cbae350d0 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dune-project +++ b/src/proto_alpha/lib_protocol/test/helpers/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-alpha-test-helpers) diff --git a/src/proto_alpha/lib_protocol/test/helpers/tezos-alpha-test-helpers.opam b/src/proto_alpha/lib_protocol/test/helpers/tezos-alpha-test-helpers.opam index e0d49f7bf..2412efde5 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/tezos-alpha-test-helpers.opam +++ b/src/proto_alpha/lib_protocol/test/helpers/tezos-alpha-test-helpers.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.7" } + "dune" { >= "2.0" } "tezos-base" "tezos-stdlib-unix" "tezos-shell-services" diff --git a/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam index ef439dc1a..0f3de2dcb 100644 --- a/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam +++ b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-alpha" "tezos-protocol-compiler" diff --git a/src/proto_alpha/lib_protocol/tezos-protocol-alpha-tests.opam b/src/proto_alpha/lib_protocol/tezos-protocol-alpha-tests.opam index ef841c43e..56c945860 100644 --- a/src/proto_alpha/lib_protocol/tezos-protocol-alpha-tests.opam +++ b/src/proto_alpha/lib_protocol/tezos-protocol-alpha-tests.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-compiler" "alcotest-lwt" { with-test & >= "1.1.0" } diff --git a/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam index 8c8b93cdf..de6f47137 100644 --- a/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam +++ b/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-protocol-compiler" ] diff --git a/src/proto_demo_counter/lib_client/dune b/src/proto_demo_counter/lib_client/dune index 51a4ec763..a250891fb 100644 --- a/src/proto_demo_counter/lib_client/dune +++ b/src/proto_demo_counter/lib_client/dune @@ -16,7 +16,7 @@ -open Tezos_client_commands -open Tezos_protocol_demo_counter))) -(alias - (name runtest_indent) +(rule + (alias runtest_indent) (deps (glob_files *.ml{,i})) (action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps}))) diff --git a/src/proto_demo_counter/lib_client/dune-project b/src/proto_demo_counter/lib_client/dune-project index b3a05bfc3..9dda929e8 100644 --- a/src/proto_demo_counter/lib_client/dune-project +++ b/src/proto_demo_counter/lib_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-demo-counter) diff --git a/src/proto_demo_counter/lib_client/tezos-client-demo-counter.opam b/src/proto_demo_counter/lib_client/tezos-client-demo-counter.opam index 45539b400..e297e61fa 100644 --- a/src/proto_demo_counter/lib_client/tezos-client-demo-counter.opam +++ b/src/proto_demo_counter/lib_client/tezos-client-demo-counter.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/src/proto_demo_counter/lib_protocol/dune-project b/src/proto_demo_counter/lib_protocol/dune-project index f346daa6f..028e89952 100644 --- a/src/proto_demo_counter/lib_protocol/dune-project +++ b/src/proto_demo_counter/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-demo-counter) diff --git a/src/proto_demo_counter/lib_protocol/dune.inc b/src/proto_demo_counter/lib_protocol/dune.inc index 19f7f996a..742060e4a 100644 --- a/src/proto_demo_counter/lib_protocol/dune.inc +++ b/src/proto_demo_counter/lib_protocol/dune.inc @@ -140,8 +140,8 @@ include Tezos_raw_protocol_demo_counter.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps error.mli error.ml proto_params.mli proto_params.ml @@ -155,11 +155,13 @@ include Tezos_raw_protocol_demo_counter.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} -no-hash-check .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_demo_counter.objs/native/tezos_protocol_demo_counter.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_demo_counter.objs/native/tezos_protocol_demo_counter.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-demo-counter) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_demo_counter/lib_protocol/tezos-embedded-protocol-demo-counter.opam b/src/proto_demo_counter/lib_protocol/tezos-embedded-protocol-demo-counter.opam index e4e350972..428802888 100644 --- a/src/proto_demo_counter/lib_protocol/tezos-embedded-protocol-demo-counter.opam +++ b/src/proto_demo_counter/lib_protocol/tezos-embedded-protocol-demo-counter.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-protocol-demo-counter" "tezos-protocol-compiler" "tezos-protocol-updater" diff --git a/src/proto_demo_counter/lib_protocol/tezos-protocol-demo-counter.opam b/src/proto_demo_counter/lib_protocol/tezos-protocol-demo-counter.opam index c997cbcf1..1468bd5fa 100644 --- a/src/proto_demo_counter/lib_protocol/tezos-protocol-demo-counter.opam +++ b/src/proto_demo_counter/lib_protocol/tezos-protocol-demo-counter.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "ocamlfind" { build } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-protocol-compiler" ] build: [ diff --git a/src/proto_demo_noops/lib_protocol/dune-project b/src/proto_demo_noops/lib_protocol/dune-project index 3ade7f01b..4ae4bb3eb 100644 --- a/src/proto_demo_noops/lib_protocol/dune-project +++ b/src/proto_demo_noops/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-demo-noops) diff --git a/src/proto_demo_noops/lib_protocol/dune.inc b/src/proto_demo_noops/lib_protocol/dune.inc index 79fc713e2..68ab3e80e 100644 --- a/src/proto_demo_noops/lib_protocol/dune.inc +++ b/src/proto_demo_noops/lib_protocol/dune.inc @@ -108,18 +108,20 @@ include Tezos_raw_protocol_demo_noops.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps main.mli main.ml (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} -no-hash-check .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_demo_noops.objs/native/tezos_protocol_demo_noops.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_demo_noops.objs/native/tezos_protocol_demo_noops.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-demo-noops) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_demo_noops/lib_protocol/tezos-embedded-protocol-demo-noops.opam b/src/proto_demo_noops/lib_protocol/tezos-embedded-protocol-demo-noops.opam index 89ac3fdf4..d6e31647c 100644 --- a/src/proto_demo_noops/lib_protocol/tezos-embedded-protocol-demo-noops.opam +++ b/src/proto_demo_noops/lib_protocol/tezos-embedded-protocol-demo-noops.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-protocol-demo-noops" "tezos-protocol-compiler" "tezos-protocol-updater" diff --git a/src/proto_demo_noops/lib_protocol/tezos-protocol-demo-noops.opam b/src/proto_demo_noops/lib_protocol/tezos-protocol-demo-noops.opam index 25a8290b6..398678a68 100644 --- a/src/proto_demo_noops/lib_protocol/tezos-protocol-demo-noops.opam +++ b/src/proto_demo_noops/lib_protocol/tezos-protocol-demo-noops.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-protocol-compiler" ] build: [ diff --git a/src/proto_genesis/lib_client/dune b/src/proto_genesis/lib_client/dune index 1c8e42c1d..e87e4d028 100644 --- a/src/proto_genesis/lib_client/dune +++ b/src/proto_genesis/lib_client/dune @@ -15,7 +15,7 @@ -open Tezos_protocol_genesis -open Tezos_client_commands))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{libexec:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_genesis/lib_client/dune-project b/src/proto_genesis/lib_client/dune-project index f060c5b46..36ec41133 100644 --- a/src/proto_genesis/lib_client/dune-project +++ b/src/proto_genesis/lib_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-genesis) diff --git a/src/proto_genesis/lib_client/tezos-client-genesis.opam b/src/proto_genesis/lib_client/tezos-client-genesis.opam index 1134e408a..14fed1935 100644 --- a/src/proto_genesis/lib_client/tezos-client-genesis.opam +++ b/src/proto_genesis/lib_client/tezos-client-genesis.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/src/proto_genesis/lib_protocol/dune-project b/src/proto_genesis/lib_protocol/dune-project index 4cf57bd54..e49ed2d1d 100644 --- a/src/proto_genesis/lib_protocol/dune-project +++ b/src/proto_genesis/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-genesis) diff --git a/src/proto_genesis/lib_protocol/dune.inc b/src/proto_genesis/lib_protocol/dune.inc index 63992f215..6867c7e2c 100644 --- a/src/proto_genesis/lib_protocol/dune.inc +++ b/src/proto_genesis/lib_protocol/dune.inc @@ -116,8 +116,8 @@ include Tezos_raw_protocol_genesis.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps data.ml services.ml @@ -125,11 +125,13 @@ include Tezos_raw_protocol_genesis.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} -no-hash-check .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_genesis.objs/native/tezos_protocol_genesis.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_genesis.objs/native/tezos_protocol_genesis.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-genesis) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam b/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam index f7f9b64ef..b2f9cf101 100644 --- a/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam +++ b/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-protocol-genesis" "tezos-protocol-updater" "tezos-protocol-compiler" diff --git a/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam b/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam index 50ca89837..722c74ebe 100644 --- a/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam +++ b/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-protocol-compiler" ] build: [ diff --git a/src/proto_genesis_carthagenet/lib_client/dune b/src/proto_genesis_carthagenet/lib_client/dune index a7345e1d4..9bfb53f2e 100644 --- a/src/proto_genesis_carthagenet/lib_client/dune +++ b/src/proto_genesis_carthagenet/lib_client/dune @@ -15,7 +15,7 @@ -open Tezos_protocol_genesis_carthagenet -open Tezos_client_commands))) -(alias - (name runtest_lint) +(rule + (alias runtest_lint) (deps (glob_files *.ml{,i})) (action (run %{libexec:tezos-tooling:lint.sh} %{deps}))) diff --git a/src/proto_genesis_carthagenet/lib_client/dune-project b/src/proto_genesis_carthagenet/lib_client/dune-project index a8fa21c9d..9b7009958 100644 --- a/src/proto_genesis_carthagenet/lib_client/dune-project +++ b/src/proto_genesis_carthagenet/lib_client/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-client-genesis-carthagenet) diff --git a/src/proto_genesis_carthagenet/lib_client/tezos-client-genesis-carthagenet.opam b/src/proto_genesis_carthagenet/lib_client/tezos-client-genesis-carthagenet.opam index 9e925fde2..5c97e109e 100644 --- a/src/proto_genesis_carthagenet/lib_client/tezos-client-genesis-carthagenet.opam +++ b/src/proto_genesis_carthagenet/lib_client/tezos-client-genesis-carthagenet.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-base" "tezos-shell-services" "tezos-client-base" diff --git a/src/proto_genesis_carthagenet/lib_protocol/dune-project b/src/proto_genesis_carthagenet/lib_protocol/dune-project index aa8d088ab..2efd57e49 100644 --- a/src/proto_genesis_carthagenet/lib_protocol/dune-project +++ b/src/proto_genesis_carthagenet/lib_protocol/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.11) +(lang dune 2.0) +(formatting (enabled_for ocaml)) (name tezos-embedded-protocol-genesis-carthagenet) diff --git a/src/proto_genesis_carthagenet/lib_protocol/dune.inc b/src/proto_genesis_carthagenet/lib_protocol/dune.inc index acadd0839..c6f10e04e 100644 --- a/src/proto_genesis_carthagenet/lib_protocol/dune.inc +++ b/src/proto_genesis_carthagenet/lib_protocol/dune.inc @@ -116,8 +116,8 @@ include Tezos_raw_protocol_genesis_carthagenet.Main -warn-error +a)) (modules Registerer)) -(alias - (name runtest_compile_protocol) +(rule + (alias runtest_compile_protocol) (deps data.ml services.ml @@ -125,11 +125,13 @@ include Tezos_raw_protocol_genesis_carthagenet.Main (:src_dir TEZOS_PROTOCOL)) (action (run %{bin:tezos-protocol-compiler} -no-hash-check .))) -(alias - (name runtest_sandbox) - (deps .tezos_protocol_genesis_carthagenet.objs/native/tezos_protocol_genesis_carthagenet.cmx)) +(rule + (alias runtest_sandbox) + (deps .tezos_protocol_genesis_carthagenet.objs/native/tezos_protocol_genesis_carthagenet.cmx) + (action (progn))) -(alias - (name runtest) +(rule + (alias runtest) (package tezos-protocol-genesis-carthagenet) - (deps (alias runtest_sandbox))) + (deps (alias runtest_sandbox)) + (action (progn))) diff --git a/src/proto_genesis_carthagenet/lib_protocol/tezos-embedded-protocol-genesis-carthagenet.opam b/src/proto_genesis_carthagenet/lib_protocol/tezos-embedded-protocol-genesis-carthagenet.opam index 2d2f50966..6b946e874 100644 --- a/src/proto_genesis_carthagenet/lib_protocol/tezos-embedded-protocol-genesis-carthagenet.opam +++ b/src/proto_genesis_carthagenet/lib_protocol/tezos-embedded-protocol-genesis-carthagenet.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-protocol-genesis-carthagenet" "tezos-protocol-updater" "tezos-protocol-compiler" diff --git a/src/proto_genesis_carthagenet/lib_protocol/tezos-protocol-genesis-carthagenet.opam b/src/proto_genesis_carthagenet/lib_protocol/tezos-protocol-genesis-carthagenet.opam index 9d32430a0..02c27e8f6 100644 --- a/src/proto_genesis_carthagenet/lib_protocol/tezos-protocol-genesis-carthagenet.opam +++ b/src/proto_genesis_carthagenet/lib_protocol/tezos-protocol-genesis-carthagenet.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "tezos-tooling" { with-test } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezos-protocol-compiler" ] build: [ diff --git a/src/tooling/dune-project b/src/tooling/dune-project index 0ec4e551d..2f6b8e91c 100644 --- a/src/tooling/dune-project +++ b/src/tooling/dune-project @@ -1,2 +1,3 @@ (lang dune 2.0) +(formatting disabled) (name tezos-tooling) diff --git a/src/tooling/tezos-tooling.opam b/src/tooling/tezos-tooling.opam index 0d73119ed..e69888491 100644 --- a/src/tooling/tezos-tooling.opam +++ b/src/tooling/tezos-tooling.opam @@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ "coq-of-ocaml" { = "2.2.1" } - "dune" { >= "1.11" } + "dune" { >= "2.0" } "ocamlformat" { = "0.10" } "bisect_ppx" { >= "2.3" } ] diff --git a/tezt/lib/tezt.opam b/tezt/lib/tezt.opam index 501e2ebcf..78c5a02c4 100644 --- a/tezt/lib/tezt.opam +++ b/tezt/lib/tezt.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "re" "lwt" "ezjsonm" diff --git a/tezt/lib_tezos/tezt-tezos.opam b/tezt/lib_tezos/tezt-tezos.opam index d28f34bcc..c13c3959c 100644 --- a/tezt/lib_tezos/tezt-tezos.opam +++ b/tezt/lib_tezos/tezt-tezos.opam @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "git+https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "dune" { >= "1.11" } + "dune" { >= "2.0" } "tezt" "hex" ]