From ccfd23b3d9c5013f07e02ee8c5c55a08450a580c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Tue, 16 May 2023 21:32:44 +0200 Subject: [PATCH 1/2] Contrib: Add an essentially-empty contrib dir --- contrib/README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 contrib/README.md diff --git a/contrib/README.md b/contrib/README.md new file mode 100644 index 000000000000..97e39b7019da --- /dev/null +++ b/contrib/README.md @@ -0,0 +1,16 @@ +# Contributed Software + +This directory is meant to host the source code of tools which can be +useful for users and developers of Octez and the Tezos protocol but +which don't deserve as much care as the components which are critical +for the security of Tezos and Octez users. + +Putting these non-critical pieces of code in a distinct directory +serves the following purposes: +- preventing accidental call of this code from the critical components; +- the mere presence of a tool in this directory indicates that it is + considered non-critical; +- locating these tools under some directory eases the definition of + approval rules lowering the quality requirements for non-critical + code. + -- GitLab From 6451ad917866ad1de88e58aa39081ea2acdc20dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Sun, 21 May 2023 15:48:10 +0200 Subject: [PATCH 2/2] Manifest: build without contrib This is meant to ensure that the critical part of Octez can be built without the non-critical part defined in the contrib directory. Thus ensuring that it does not accidentally call it. --- manifest/manifest.ml | 5 ++++- opam/internal-devtools.opam | 2 +- opam/octez-accuser-PtMumbai.opam | 2 +- opam/octez-accuser-PtNairob.opam | 2 +- opam/octez-accuser-alpha.opam | 2 +- opam/octez-alcotezt.opam | 2 +- opam/octez-aplonk.opam | 2 +- opam/octez-baker-PtMumbai.opam | 2 +- opam/octez-baker-PtNairob.opam | 2 +- opam/octez-baker-alpha.opam | 2 +- opam/octez-bls12-381-hash.opam | 2 +- opam/octez-bls12-381-polynomial.opam | 2 +- opam/octez-bls12-381-signature.opam | 2 +- opam/octez-client.opam | 2 +- opam/octez-codec.opam | 2 +- opam/octez-crawler.opam | 2 +- opam/octez-dac-client.opam | 2 +- opam/octez-dac-node.opam | 2 +- opam/octez-dal-node.opam | 2 +- opam/octez-distributed-internal.opam | 2 +- opam/octez-distributed-lwt-internal.opam | 2 +- opam/octez-distributed-plonk.opam | 2 +- opam/octez-epoxy-tx.opam | 2 +- opam/octez-evm-proxy.opam | 2 +- opam/octez-injector.opam | 2 +- opam/octez-mec.opam | 2 +- opam/octez-node-config.opam | 2 +- opam/octez-node.opam | 2 +- opam/octez-plompiler.opam | 2 +- opam/octez-plonk.opam | 2 +- opam/octez-polynomial.opam | 2 +- opam/octez-protocol-compiler.opam | 2 +- opam/octez-proxy-server.opam | 2 +- opam/octez-signer.opam | 2 +- opam/octez-smart-rollup-client-PtMumbai.opam | 2 +- opam/octez-smart-rollup-client-PtNairob.opam | 2 +- opam/octez-smart-rollup-client-alpha.opam | 2 +- opam/octez-smart-rollup-node-PtMumbai.opam | 2 +- opam/octez-smart-rollup-node-PtNairob.opam | 2 +- opam/octez-smart-rollup-node-alpha.opam | 2 +- opam/octez-smart-rollup-node.opam | 2 +- opam/octez-smart-rollup-wasm-benchmark-lib.opam | 2 +- opam/octez-smart-rollup-wasm-benchmark.opam | 2 +- opam/octez-smart-rollup-wasm-debugger.opam | 2 +- opam/octez-snoop.opam | 2 +- opam/octez-srs-extraction.opam | 2 +- opam/octez-testnet-scenarios.opam | 2 +- opam/tezos-016-PtMumbai-test-helpers.opam | 2 +- opam/tezos-017-PtNairob-test-helpers.opam | 2 +- opam/tezos-alpha-test-helpers.opam | 2 +- opam/tezos-baking-016-PtMumbai-commands.opam | 2 +- opam/tezos-baking-016-PtMumbai.opam | 2 +- opam/tezos-baking-017-PtNairob-commands.opam | 2 +- opam/tezos-baking-017-PtNairob.opam | 2 +- opam/tezos-baking-alpha-commands.opam | 2 +- opam/tezos-baking-alpha.opam | 2 +- opam/tezos-base-test-helpers.opam | 2 +- opam/tezos-base.opam | 2 +- opam/tezos-benchmark-016-PtMumbai.opam | 2 +- opam/tezos-benchmark-017-PtNairob.opam | 2 +- opam/tezos-benchmark-alpha.opam | 2 +- opam/tezos-benchmark-examples.opam | 2 +- opam/tezos-benchmark-tests.opam | 2 +- opam/tezos-benchmark-type-inference-016-PtMumbai.opam | 2 +- opam/tezos-benchmark-type-inference-017-PtNairob.opam | 2 +- opam/tezos-benchmark-type-inference-alpha.opam | 2 +- opam/tezos-benchmark.opam | 2 +- opam/tezos-benchmarks-proto-016-PtMumbai.opam | 2 +- opam/tezos-benchmarks-proto-017-PtNairob.opam | 2 +- opam/tezos-benchmarks-proto-alpha.opam | 2 +- opam/tezos-clic.opam | 2 +- opam/tezos-client-000-Ps9mPmXa.opam | 2 +- opam/tezos-client-001-PtCJ7pwo.opam | 2 +- opam/tezos-client-002-PsYLVpVv.opam | 2 +- opam/tezos-client-003-PsddFKi3.opam | 2 +- opam/tezos-client-004-Pt24m4xi.opam | 2 +- opam/tezos-client-005-PsBabyM1.opam | 2 +- opam/tezos-client-006-PsCARTHA.opam | 2 +- opam/tezos-client-007-PsDELPH1.opam | 2 +- opam/tezos-client-008-PtEdo2Zk.opam | 2 +- opam/tezos-client-009-PsFLoren.opam | 2 +- opam/tezos-client-010-PtGRANAD.opam | 2 +- opam/tezos-client-011-PtHangz2.opam | 2 +- opam/tezos-client-012-Psithaca.opam | 2 +- opam/tezos-client-013-PtJakart.opam | 2 +- opam/tezos-client-014-PtKathma.opam | 2 +- opam/tezos-client-015-PtLimaPt.opam | 2 +- opam/tezos-client-016-PtMumbai.opam | 2 +- opam/tezos-client-017-PtNairob.opam | 2 +- opam/tezos-client-alpha.opam | 2 +- opam/tezos-client-base-unix.opam | 2 +- opam/tezos-client-base.opam | 2 +- opam/tezos-client-commands.opam | 2 +- opam/tezos-client-demo-counter.opam | 2 +- opam/tezos-client-genesis.opam | 2 +- opam/tezos-context-ops.opam | 2 +- opam/tezos-context.opam | 2 +- opam/tezos-crypto-dal.opam | 2 +- opam/tezos-crypto.opam | 2 +- opam/tezos-dac-017-PtNairob.opam | 2 +- opam/tezos-dac-alpha.opam | 2 +- opam/tezos-dac-client-lib.opam | 2 +- opam/tezos-dac-lib-test.opam | 2 +- opam/tezos-dac-lib.opam | 2 +- opam/tezos-dac-node-lib-test.opam | 2 +- opam/tezos-dac-node-lib.opam | 2 +- opam/tezos-dal-016-PtMumbai.opam | 2 +- opam/tezos-dal-017-PtNairob.opam | 2 +- opam/tezos-dal-alpha.opam | 2 +- opam/tezos-dal-node-lib.opam | 2 +- opam/tezos-dal-node-services.opam | 2 +- opam/tezos-embedded-protocol-000-Ps9mPmXa.opam | 2 +- opam/tezos-embedded-protocol-001-PtCJ7pwo.opam | 2 +- opam/tezos-embedded-protocol-002-PsYLVpVv.opam | 2 +- opam/tezos-embedded-protocol-003-PsddFKi3.opam | 2 +- opam/tezos-embedded-protocol-004-Pt24m4xi.opam | 2 +- opam/tezos-embedded-protocol-005-PsBABY5H.opam | 2 +- opam/tezos-embedded-protocol-005-PsBabyM1.opam | 2 +- opam/tezos-embedded-protocol-006-PsCARTHA.opam | 2 +- opam/tezos-embedded-protocol-007-PsDELPH1.opam | 2 +- opam/tezos-embedded-protocol-008-PtEdo2Zk.opam | 2 +- opam/tezos-embedded-protocol-008-PtEdoTez.opam | 2 +- opam/tezos-embedded-protocol-009-PsFLoren.opam | 2 +- opam/tezos-embedded-protocol-010-PtGRANAD.opam | 2 +- opam/tezos-embedded-protocol-011-PtHangz2.opam | 2 +- opam/tezos-embedded-protocol-012-Psithaca.opam | 2 +- opam/tezos-embedded-protocol-013-PtJakart.opam | 2 +- opam/tezos-embedded-protocol-014-PtKathma.opam | 2 +- opam/tezos-embedded-protocol-015-PtLimaPt.opam | 2 +- opam/tezos-embedded-protocol-016-PtMumbai.opam | 2 +- opam/tezos-embedded-protocol-017-PtNairob.opam | 2 +- opam/tezos-embedded-protocol-alpha.opam | 2 +- opam/tezos-embedded-protocol-demo-counter.opam | 2 +- opam/tezos-embedded-protocol-demo-noops.opam | 2 +- opam/tezos-embedded-protocol-genesis.opam | 2 +- opam/tezos-error-monad.opam | 2 +- opam/tezos-event-logging-test-helpers.opam | 2 +- opam/tezos-event-logging.opam | 2 +- opam/tezos-expect-helper.opam | 2 +- opam/tezos-gossipsub-test.opam | 2 +- opam/tezos-gossipsub.opam | 2 +- opam/tezos-hacl.opam | 2 +- opam/tezos-layer2-store.opam | 2 +- opam/tezos-layer2-utils-016-PtMumbai.opam | 2 +- opam/tezos-layer2-utils-017-PtNairob.opam | 2 +- opam/tezos-layer2-utils-alpha.opam | 2 +- opam/tezos-lazy-containers-tests.opam | 2 +- opam/tezos-lazy-containers.opam | 2 +- opam/tezos-lwt-result-stdlib.opam | 2 +- opam/tezos-micheline-rewriting.opam | 2 +- opam/tezos-micheline.opam | 2 +- opam/tezos-mockup-commands.opam | 2 +- opam/tezos-mockup-proxy.opam | 2 +- opam/tezos-mockup-registration.opam | 2 +- opam/tezos-mockup.opam | 2 +- opam/tezos-openapi.opam | 2 +- opam/tezos-p2p-services.opam | 2 +- opam/tezos-p2p.opam | 2 +- opam/tezos-protocol-000-Ps9mPmXa.opam | 2 +- opam/tezos-protocol-001-PtCJ7pwo.opam | 2 +- opam/tezos-protocol-002-PsYLVpVv.opam | 2 +- opam/tezos-protocol-003-PsddFKi3.opam | 2 +- opam/tezos-protocol-004-Pt24m4xi.opam | 2 +- opam/tezos-protocol-005-PsBABY5H.opam | 2 +- opam/tezos-protocol-005-PsBabyM1.opam | 2 +- opam/tezos-protocol-006-PsCARTHA.opam | 2 +- opam/tezos-protocol-007-PsDELPH1.opam | 2 +- opam/tezos-protocol-008-PtEdo2Zk.opam | 2 +- opam/tezos-protocol-008-PtEdoTez.opam | 2 +- opam/tezos-protocol-009-PsFLoren.opam | 2 +- opam/tezos-protocol-010-PtGRANAD.opam | 2 +- opam/tezos-protocol-011-PtHangz2.opam | 2 +- opam/tezos-protocol-012-Psithaca.opam | 2 +- opam/tezos-protocol-013-PtJakart.opam | 2 +- opam/tezos-protocol-014-PtKathma.opam | 2 +- opam/tezos-protocol-015-PtLimaPt.opam | 2 +- opam/tezos-protocol-016-PtMumbai-tests.opam | 2 +- opam/tezos-protocol-016-PtMumbai.opam | 2 +- opam/tezos-protocol-017-PtNairob-tests.opam | 2 +- opam/tezos-protocol-017-PtNairob.opam | 2 +- opam/tezos-protocol-alpha-tests.opam | 2 +- opam/tezos-protocol-alpha.opam | 2 +- opam/tezos-protocol-demo-counter.opam | 2 +- opam/tezos-protocol-demo-noops.opam | 2 +- opam/tezos-protocol-environment.opam | 2 +- opam/tezos-protocol-genesis.opam | 2 +- opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam | 2 +- opam/tezos-protocol-plugin-007-PsDELPH1.opam | 2 +- opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam | 2 +- opam/tezos-protocol-plugin-008-PtEdo2Zk.opam | 2 +- opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam | 2 +- opam/tezos-protocol-plugin-009-PsFLoren.opam | 2 +- opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam | 2 +- opam/tezos-protocol-plugin-010-PtGRANAD.opam | 2 +- opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam | 2 +- opam/tezos-protocol-plugin-011-PtHangz2.opam | 2 +- opam/tezos-protocol-plugin-012-Psithaca-registerer.opam | 2 +- opam/tezos-protocol-plugin-012-Psithaca.opam | 2 +- opam/tezos-protocol-plugin-013-PtJakart-registerer.opam | 2 +- opam/tezos-protocol-plugin-013-PtJakart.opam | 2 +- opam/tezos-protocol-plugin-014-PtKathma-registerer.opam | 2 +- opam/tezos-protocol-plugin-014-PtKathma.opam | 2 +- opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam | 2 +- opam/tezos-protocol-plugin-015-PtLimaPt.opam | 2 +- opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam | 2 +- opam/tezos-protocol-plugin-016-PtMumbai-tests.opam | 2 +- opam/tezos-protocol-plugin-016-PtMumbai.opam | 2 +- opam/tezos-protocol-plugin-017-PtNairob-registerer.opam | 2 +- opam/tezos-protocol-plugin-017-PtNairob-tests.opam | 2 +- opam/tezos-protocol-plugin-017-PtNairob.opam | 2 +- opam/tezos-protocol-plugin-alpha-registerer.opam | 2 +- opam/tezos-protocol-plugin-alpha-tests.opam | 2 +- opam/tezos-protocol-plugin-alpha.opam | 2 +- opam/tezos-protocol-updater.opam | 2 +- opam/tezos-proxy-server-config.opam | 2 +- opam/tezos-proxy.opam | 2 +- opam/tezos-requester.opam | 2 +- opam/tezos-rpc-http-client-unix.opam | 2 +- opam/tezos-rpc-http-client.opam | 2 +- opam/tezos-rpc-http-server.opam | 2 +- opam/tezos-rpc-http.opam | 2 +- opam/tezos-rpc.opam | 2 +- opam/tezos-sapling.opam | 2 +- opam/tezos-sc-rollup-node-test.opam | 2 +- opam/tezos-scoru-wasm-durable-snapshot.opam | 2 +- opam/tezos-scoru-wasm-fast-test.opam | 2 +- opam/tezos-scoru-wasm-fast.opam | 2 +- opam/tezos-scoru-wasm-helpers.opam | 2 +- opam/tezos-scoru-wasm-regressions.opam | 2 +- opam/tezos-scoru-wasm-test-helpers.opam | 2 +- opam/tezos-scoru-wasm-test.opam | 2 +- opam/tezos-scoru-wasm.opam | 2 +- opam/tezos-shell-benchmarks.opam | 2 +- opam/tezos-shell-context-test.opam | 2 +- opam/tezos-shell-context.opam | 2 +- opam/tezos-shell-services.opam | 2 +- opam/tezos-shell.opam | 2 +- opam/tezos-signer-backends.opam | 2 +- opam/tezos-signer-services.opam | 2 +- opam/tezos-smart-rollup-016-PtMumbai.opam | 2 +- opam/tezos-smart-rollup-017-PtNairob.opam | 2 +- opam/tezos-smart-rollup-alpha.opam | 2 +- opam/tezos-smart-rollup-layer2-016-PtMumbai.opam | 2 +- opam/tezos-smart-rollup-layer2-017-PtNairob.opam | 2 +- opam/tezos-smart-rollup-layer2-alpha.opam | 2 +- opam/tezos-stdlib-unix.opam | 2 +- opam/tezos-stdlib.opam | 2 +- opam/tezos-store.opam | 2 +- opam/tezos-test-helpers.opam | 2 +- opam/tezos-tooling.opam | 2 +- opam/tezos-tps-evaluation.opam | 2 +- opam/tezos-tree-encoding-test.opam | 2 +- opam/tezos-tree-encoding.opam | 2 +- opam/tezos-validation.opam | 2 +- opam/tezos-version.opam | 2 +- opam/tezos-wasmer.opam | 2 +- opam/tezos-webassembly-interpreter-extra.opam | 2 +- opam/tezos-webassembly-interpreter.opam | 2 +- opam/tezos-workers.opam | 2 +- opam/tezt-ethereum.opam | 2 +- opam/tezt-performance-regression.opam | 2 +- opam/tezt-tezos.opam | 2 +- 262 files changed, 265 insertions(+), 262 deletions(-) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index e99a2aa3604b..714e28c11fb3 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -2740,7 +2740,10 @@ let generate_opam ?release for_package (internals : Target.internal list) : |> String_set.of_list |> String_set.elements |> List.concat_map make_runtest in - {Opam.command = [S "rm"; S "-r"; S "vendors"]; with_test = Never} + { + Opam.command = [S "rm"; S "-r"; S "vendors"; S "contrib"]; + with_test = Never; + } :: build :: runtests in let licenses = diff --git a/opam/internal-devtools.opam b/opam/internal-devtools.opam index bbfbfcbae98d..3a46bd717e90 100644 --- a/opam/internal-devtools.opam +++ b/opam/internal-devtools.opam @@ -22,7 +22,7 @@ conflicts: [ "utop" { < "2.8" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-accuser-PtMumbai.opam b/opam/octez-accuser-PtMumbai.opam index 5cc6f6bcb3ea..84316b58dc01 100644 --- a/opam/octez-accuser-PtMumbai.opam +++ b/opam/octez-accuser-PtMumbai.opam @@ -20,7 +20,7 @@ depends: [ "tezos-client-base-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-accuser-PtNairob.opam b/opam/octez-accuser-PtNairob.opam index 079a7c550325..27222e7977b5 100644 --- a/opam/octez-accuser-PtNairob.opam +++ b/opam/octez-accuser-PtNairob.opam @@ -20,7 +20,7 @@ depends: [ "tezos-client-base-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-accuser-alpha.opam b/opam/octez-accuser-alpha.opam index 1287560e77ba..547db13989a7 100644 --- a/opam/octez-accuser-alpha.opam +++ b/opam/octez-accuser-alpha.opam @@ -20,7 +20,7 @@ depends: [ "tezos-client-base-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-alcotezt.opam b/opam/octez-alcotezt.opam index 62d9538082b3..25d9043a0726 100644 --- a/opam/octez-alcotezt.opam +++ b/opam/octez-alcotezt.opam @@ -13,7 +13,7 @@ depends: [ "tezt" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-aplonk.opam b/opam/octez-aplonk.opam index 42747a6722aa..5837ccbbb040 100644 --- a/opam/octez-aplonk.opam +++ b/opam/octez-aplonk.opam @@ -14,7 +14,7 @@ depends: [ "octez-plonk" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-baker-PtMumbai.opam b/opam/octez-baker-PtMumbai.opam index a28919ebb272..48a9d1bc7a9d 100644 --- a/opam/octez-baker-PtMumbai.opam +++ b/opam/octez-baker-PtMumbai.opam @@ -20,7 +20,7 @@ depends: [ "tezos-client-base-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-baker-PtNairob.opam b/opam/octez-baker-PtNairob.opam index 3b24d99d31c9..798da530c1ab 100644 --- a/opam/octez-baker-PtNairob.opam +++ b/opam/octez-baker-PtNairob.opam @@ -20,7 +20,7 @@ depends: [ "tezos-client-base-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-baker-alpha.opam b/opam/octez-baker-alpha.opam index 758737cb5af8..5e6bb665ecbc 100644 --- a/opam/octez-baker-alpha.opam +++ b/opam/octez-baker-alpha.opam @@ -20,7 +20,7 @@ depends: [ "tezos-client-base-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-bls12-381-hash.opam b/opam/octez-bls12-381-hash.opam index ea009cd23a59..e3753e905846 100644 --- a/opam/octez-bls12-381-hash.opam +++ b/opam/octez-bls12-381-hash.opam @@ -16,7 +16,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-bls12-381-polynomial.opam b/opam/octez-bls12-381-polynomial.opam index 0130813c0668..a7a90f6c3a39 100644 --- a/opam/octez-bls12-381-polynomial.opam +++ b/opam/octez-bls12-381-polynomial.opam @@ -20,7 +20,7 @@ depends: [ "bisect_ppx" { with-test & >= "2.7.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-bls12-381-signature.opam b/opam/octez-bls12-381-signature.opam index 3134fabfdc32..064020de2304 100644 --- a/opam/octez-bls12-381-signature.opam +++ b/opam/octez-bls12-381-signature.opam @@ -16,7 +16,7 @@ depends: [ "re" { >= "1.9.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-client.opam b/opam/octez-client.opam index 005fb675f36a..fa00929eb934 100644 --- a/opam/octez-client.opam +++ b/opam/octez-client.opam @@ -62,7 +62,7 @@ depopts: [ "tezos-protocol-plugin-alpha" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-codec.opam b/opam/octez-codec.opam index 6f3e3e46e329..19e5bf325ac0 100644 --- a/opam/octez-codec.opam +++ b/opam/octez-codec.opam @@ -36,7 +36,7 @@ depopts: [ "tezos-client-alpha" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-crawler.opam b/opam/octez-crawler.opam index 2b8da4a26683..ee31a070bf4f 100644 --- a/opam/octez-crawler.opam +++ b/opam/octez-crawler.opam @@ -17,7 +17,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-dac-client.opam b/opam/octez-dac-client.opam index c40f9feba218..bdf41d7b7302 100644 --- a/opam/octez-dac-client.opam +++ b/opam/octez-dac-client.opam @@ -25,7 +25,7 @@ depopts: [ "tezos-dac-alpha" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-dac-node.opam b/opam/octez-dac-node.opam index 74d4c50306b4..0742cfccc97b 100644 --- a/opam/octez-dac-node.opam +++ b/opam/octez-dac-node.opam @@ -34,7 +34,7 @@ conflicts: [ "checkseum" { = "0.5.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam index 86ab3d2d9871..2ae52cd34e9b 100644 --- a/opam/octez-dal-node.opam +++ b/opam/octez-dal-node.opam @@ -42,7 +42,7 @@ conflicts: [ "checkseum" { = "0.5.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-distributed-internal.opam b/opam/octez-distributed-internal.opam index 4097153e5d1d..b99ac01d9cae 100644 --- a/opam/octez-distributed-internal.opam +++ b/opam/octez-distributed-internal.opam @@ -13,7 +13,7 @@ depends: [ "base-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-distributed-lwt-internal.opam b/opam/octez-distributed-lwt-internal.opam index eecebd2b4d2e..f2b90b05d965 100644 --- a/opam/octez-distributed-lwt-internal.opam +++ b/opam/octez-distributed-lwt-internal.opam @@ -16,7 +16,7 @@ depends: [ "logs" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-distributed-plonk.opam b/opam/octez-distributed-plonk.opam index 412ccff51791..2d2e2276589e 100644 --- a/opam/octez-distributed-plonk.opam +++ b/opam/octez-distributed-plonk.opam @@ -15,7 +15,7 @@ depends: [ "octez-plonk" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-epoxy-tx.opam b/opam/octez-epoxy-tx.opam index d34b78e2fef8..37984656a8c2 100644 --- a/opam/octez-epoxy-tx.opam +++ b/opam/octez-epoxy-tx.opam @@ -18,7 +18,7 @@ depends: [ "octez-aplonk" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-evm-proxy.opam b/opam/octez-evm-proxy.opam index cc17d25d9789..b6f3bbe879f3 100644 --- a/opam/octez-evm-proxy.opam +++ b/opam/octez-evm-proxy.opam @@ -23,7 +23,7 @@ depends: [ "lwt-exit" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-injector.opam b/opam/octez-injector.opam index 6f15d96cb7f9..9301e2d7676f 100644 --- a/opam/octez-injector.opam +++ b/opam/octez-injector.opam @@ -21,7 +21,7 @@ depends: [ "octez-crawler" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-mec.opam b/opam/octez-mec.opam index a675fc26440a..3a2958b9afb5 100644 --- a/opam/octez-mec.opam +++ b/opam/octez-mec.opam @@ -18,7 +18,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-node-config.opam b/opam/octez-node-config.opam index 48a3e6a157c9..4fa9dc5c1d97 100644 --- a/opam/octez-node-config.opam +++ b/opam/octez-node-config.opam @@ -20,7 +20,7 @@ depends: [ "tezos-validation" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-node.opam b/opam/octez-node.opam index 0842afd00112..ca9e62b28385 100644 --- a/opam/octez-node.opam +++ b/opam/octez-node.opam @@ -71,7 +71,7 @@ depopts: [ "tezos-protocol-plugin-alpha-registerer" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-plompiler.opam b/opam/octez-plompiler.opam index d0df5f8c1df2..21cf25a28445 100644 --- a/opam/octez-plompiler.opam +++ b/opam/octez-plompiler.opam @@ -20,7 +20,7 @@ depends: [ "octez-mec" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-plonk.opam b/opam/octez-plonk.opam index 4a7e879c905d..bf15256a73e0 100644 --- a/opam/octez-plonk.opam +++ b/opam/octez-plonk.opam @@ -22,7 +22,7 @@ depends: [ "bls12-381" { >= "6.1.0" & < "6.2.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-polynomial.opam b/opam/octez-polynomial.opam index 31e463c35d71..d6700b64a2a1 100644 --- a/opam/octez-polynomial.opam +++ b/opam/octez-polynomial.opam @@ -18,7 +18,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-protocol-compiler.opam b/opam/octez-protocol-compiler.opam index d8d78bf81482..3a08872f5896 100644 --- a/opam/octez-protocol-compiler.opam +++ b/opam/octez-protocol-compiler.opam @@ -19,7 +19,7 @@ depends: [ "base-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-proxy-server.opam b/opam/octez-proxy-server.opam index 71fc84bcf395..5b1cf70e6c10 100644 --- a/opam/octez-proxy-server.opam +++ b/opam/octez-proxy-server.opam @@ -61,7 +61,7 @@ depopts: [ "tezos-protocol-plugin-alpha" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-signer.opam b/opam/octez-signer.opam index e3374c24ea9a..c877c73adc97 100644 --- a/opam/octez-signer.opam +++ b/opam/octez-signer.opam @@ -24,7 +24,7 @@ depends: [ "tezos-signer-backends" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-smart-rollup-client-PtMumbai.opam b/opam/octez-smart-rollup-client-PtMumbai.opam index 2c4a83765c9a..c6bb0e198216 100644 --- a/opam/octez-smart-rollup-client-PtMumbai.opam +++ b/opam/octez-smart-rollup-client-PtMumbai.opam @@ -21,7 +21,7 @@ depends: [ "tezos-clic" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-smart-rollup-client-PtNairob.opam b/opam/octez-smart-rollup-client-PtNairob.opam index eb37b0ab6a06..1fb7fa4b5fff 100644 --- a/opam/octez-smart-rollup-client-PtNairob.opam +++ b/opam/octez-smart-rollup-client-PtNairob.opam @@ -21,7 +21,7 @@ depends: [ "tezos-clic" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-smart-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam index 7b4611bad750..0e320ef7779a 100644 --- a/opam/octez-smart-rollup-client-alpha.opam +++ b/opam/octez-smart-rollup-client-alpha.opam @@ -21,7 +21,7 @@ depends: [ "tezos-clic" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-smart-rollup-node-PtMumbai.opam b/opam/octez-smart-rollup-node-PtMumbai.opam index a1d4c63c959e..a9816a74791f 100644 --- a/opam/octez-smart-rollup-node-PtMumbai.opam +++ b/opam/octez-smart-rollup-node-PtMumbai.opam @@ -48,7 +48,7 @@ conflicts: [ "checkseum" { = "0.5.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-smart-rollup-node-PtNairob.opam b/opam/octez-smart-rollup-node-PtNairob.opam index 49d78f713af9..9c57ed18acfa 100644 --- a/opam/octez-smart-rollup-node-PtNairob.opam +++ b/opam/octez-smart-rollup-node-PtNairob.opam @@ -48,7 +48,7 @@ conflicts: [ "checkseum" { = "0.5.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam index 839792240c0d..ed6babaea2bd 100644 --- a/opam/octez-smart-rollup-node-alpha.opam +++ b/opam/octez-smart-rollup-node-alpha.opam @@ -49,7 +49,7 @@ conflicts: [ "checkseum" { = "0.5.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-smart-rollup-node.opam b/opam/octez-smart-rollup-node.opam index 80114f0aa9e3..8f65c158b1f6 100644 --- a/opam/octez-smart-rollup-node.opam +++ b/opam/octez-smart-rollup-node.opam @@ -19,7 +19,7 @@ depends: [ "octez-injector" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-smart-rollup-wasm-benchmark-lib.opam b/opam/octez-smart-rollup-wasm-benchmark-lib.opam index 559ea348c860..afea1fd6250b 100644 --- a/opam/octez-smart-rollup-wasm-benchmark-lib.opam +++ b/opam/octez-smart-rollup-wasm-benchmark-lib.opam @@ -20,7 +20,7 @@ depends: [ "lwt" { >= "5.6.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-smart-rollup-wasm-benchmark.opam b/opam/octez-smart-rollup-wasm-benchmark.opam index acbb511066ab..e74f5dd19bb4 100644 --- a/opam/octez-smart-rollup-wasm-benchmark.opam +++ b/opam/octez-smart-rollup-wasm-benchmark.opam @@ -15,7 +15,7 @@ depends: [ "octez-smart-rollup-wasm-benchmark-lib" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-smart-rollup-wasm-debugger.opam b/opam/octez-smart-rollup-wasm-debugger.opam index ee17eb716f95..65565fd4a24a 100644 --- a/opam/octez-smart-rollup-wasm-debugger.opam +++ b/opam/octez-smart-rollup-wasm-debugger.opam @@ -21,7 +21,7 @@ depends: [ "tezos-webassembly-interpreter-extra" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-snoop.opam b/opam/octez-snoop.opam index 1acdff09ae75..6586fa7312ba 100644 --- a/opam/octez-snoop.opam +++ b/opam/octez-snoop.opam @@ -21,7 +21,7 @@ depends: [ "prbnmcn-stats" { = "0.0.6" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-srs-extraction.opam b/opam/octez-srs-extraction.opam index 01a81edae562..67ae5544d3b0 100644 --- a/opam/octez-srs-extraction.opam +++ b/opam/octez-srs-extraction.opam @@ -18,7 +18,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-testnet-scenarios.opam b/opam/octez-testnet-scenarios.opam index 00fe2aaaca3e..6c2bf4fd3bd6 100644 --- a/opam/octez-testnet-scenarios.opam +++ b/opam/octez-testnet-scenarios.opam @@ -15,7 +15,7 @@ depends: [ "tezt-ethereum" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-016-PtMumbai-test-helpers.opam b/opam/tezos-016-PtMumbai-test-helpers.opam index c041ee4aae5d..9a724812909a 100644 --- a/opam/tezos-016-PtMumbai-test-helpers.opam +++ b/opam/tezos-016-PtMumbai-test-helpers.opam @@ -24,7 +24,7 @@ depends: [ "tezos-crypto-dal" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-017-PtNairob-test-helpers.opam b/opam/tezos-017-PtNairob-test-helpers.opam index ca7f3c84a184..fd6da81869bd 100644 --- a/opam/tezos-017-PtNairob-test-helpers.opam +++ b/opam/tezos-017-PtNairob-test-helpers.opam @@ -24,7 +24,7 @@ depends: [ "tezos-crypto-dal" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-alpha-test-helpers.opam b/opam/tezos-alpha-test-helpers.opam index 1002ce39d3c9..33cd23d6a7a5 100644 --- a/opam/tezos-alpha-test-helpers.opam +++ b/opam/tezos-alpha-test-helpers.opam @@ -24,7 +24,7 @@ depends: [ "tezos-crypto-dal" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-baking-016-PtMumbai-commands.opam b/opam/tezos-baking-016-PtMumbai-commands.opam index 2ac37cc84411..8e03e528937d 100644 --- a/opam/tezos-baking-016-PtMumbai-commands.opam +++ b/opam/tezos-baking-016-PtMumbai-commands.opam @@ -23,7 +23,7 @@ depends: [ "uri" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-baking-016-PtMumbai.opam b/opam/tezos-baking-016-PtMumbai.opam index 8baedc8cd012..73e0cc150801 100644 --- a/opam/tezos-baking-016-PtMumbai.opam +++ b/opam/tezos-baking-016-PtMumbai.opam @@ -43,7 +43,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-baking-017-PtNairob-commands.opam b/opam/tezos-baking-017-PtNairob-commands.opam index cb26b68754cf..cacf526cd96f 100644 --- a/opam/tezos-baking-017-PtNairob-commands.opam +++ b/opam/tezos-baking-017-PtNairob-commands.opam @@ -23,7 +23,7 @@ depends: [ "uri" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-baking-017-PtNairob.opam b/opam/tezos-baking-017-PtNairob.opam index b31a406e50e7..80de41c771d3 100644 --- a/opam/tezos-baking-017-PtNairob.opam +++ b/opam/tezos-baking-017-PtNairob.opam @@ -44,7 +44,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-baking-alpha-commands.opam b/opam/tezos-baking-alpha-commands.opam index e8bef8b44d49..1bb7599222b6 100644 --- a/opam/tezos-baking-alpha-commands.opam +++ b/opam/tezos-baking-alpha-commands.opam @@ -23,7 +23,7 @@ depends: [ "uri" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam index baa7a5e40733..4eb5a479269a 100644 --- a/opam/tezos-baking-alpha.opam +++ b/opam/tezos-baking-alpha.opam @@ -44,7 +44,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-base-test-helpers.opam b/opam/tezos-base-test-helpers.opam index af84036676ee..2a66e00836f8 100644 --- a/opam/tezos-base-test-helpers.opam +++ b/opam/tezos-base-test-helpers.opam @@ -18,7 +18,7 @@ depends: [ "qcheck-alcotest" { >= "0.20" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-base.opam b/opam/tezos-base.opam index 475b3c29655d..f8d67b813f08 100644 --- a/opam/tezos-base.opam +++ b/opam/tezos-base.opam @@ -30,7 +30,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-benchmark-016-PtMumbai.opam b/opam/tezos-benchmark-016-PtMumbai.opam index e7ad37b58485..e28836e899df 100644 --- a/opam/tezos-benchmark-016-PtMumbai.opam +++ b/opam/tezos-benchmark-016-PtMumbai.opam @@ -24,7 +24,7 @@ depends: [ "prbnmcn-stats" { = "0.0.6" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-benchmark-017-PtNairob.opam b/opam/tezos-benchmark-017-PtNairob.opam index 9251bb9f0228..15134b1178f4 100644 --- a/opam/tezos-benchmark-017-PtNairob.opam +++ b/opam/tezos-benchmark-017-PtNairob.opam @@ -24,7 +24,7 @@ depends: [ "prbnmcn-stats" { = "0.0.6" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-benchmark-alpha.opam b/opam/tezos-benchmark-alpha.opam index a08635f89551..74be164c9d36 100644 --- a/opam/tezos-benchmark-alpha.opam +++ b/opam/tezos-benchmark-alpha.opam @@ -24,7 +24,7 @@ depends: [ "prbnmcn-stats" { = "0.0.6" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-benchmark-examples.opam b/opam/tezos-benchmark-examples.opam index 45ede119849c..b177b136d2f7 100644 --- a/opam/tezos-benchmark-examples.opam +++ b/opam/tezos-benchmark-examples.opam @@ -16,7 +16,7 @@ depends: [ "tezos-benchmark" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-benchmark-tests.opam b/opam/tezos-benchmark-tests.opam index 5791b3cecc63..1f3bcbb5f087 100644 --- a/opam/tezos-benchmark-tests.opam +++ b/opam/tezos-benchmark-tests.opam @@ -20,7 +20,7 @@ depends: [ "tezos-benchmark-examples" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-benchmark-type-inference-016-PtMumbai.opam b/opam/tezos-benchmark-type-inference-016-PtMumbai.opam index 7a7ba310d590..1f3d1f2a5e66 100644 --- a/opam/tezos-benchmark-type-inference-016-PtMumbai.opam +++ b/opam/tezos-benchmark-type-inference-016-PtMumbai.opam @@ -20,7 +20,7 @@ depends: [ "tezos-client-016-PtMumbai" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-benchmark-type-inference-017-PtNairob.opam b/opam/tezos-benchmark-type-inference-017-PtNairob.opam index 64bb105fb594..de0e2af54457 100644 --- a/opam/tezos-benchmark-type-inference-017-PtNairob.opam +++ b/opam/tezos-benchmark-type-inference-017-PtNairob.opam @@ -20,7 +20,7 @@ depends: [ "tezos-client-017-PtNairob" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-benchmark-type-inference-alpha.opam b/opam/tezos-benchmark-type-inference-alpha.opam index d1032c791999..91f3a7ce416d 100644 --- a/opam/tezos-benchmark-type-inference-alpha.opam +++ b/opam/tezos-benchmark-type-inference-alpha.opam @@ -20,7 +20,7 @@ depends: [ "tezos-client-alpha" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-benchmark.opam b/opam/tezos-benchmark.opam index 762dcf209b6d..2c502beae15a 100644 --- a/opam/tezos-benchmark.opam +++ b/opam/tezos-benchmark.opam @@ -26,7 +26,7 @@ depends: [ "hashcons" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-benchmarks-proto-016-PtMumbai.opam b/opam/tezos-benchmarks-proto-016-PtMumbai.opam index 0fdc37e64aee..26236829dead 100644 --- a/opam/tezos-benchmarks-proto-016-PtMumbai.opam +++ b/opam/tezos-benchmarks-proto-016-PtMumbai.opam @@ -28,7 +28,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-benchmarks-proto-017-PtNairob.opam b/opam/tezos-benchmarks-proto-017-PtNairob.opam index 40a489793f59..8ec2f1aa23fa 100644 --- a/opam/tezos-benchmarks-proto-017-PtNairob.opam +++ b/opam/tezos-benchmarks-proto-017-PtNairob.opam @@ -28,7 +28,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-benchmarks-proto-alpha.opam b/opam/tezos-benchmarks-proto-alpha.opam index b514fbd75814..a91e1bd6ba4c 100644 --- a/opam/tezos-benchmarks-proto-alpha.opam +++ b/opam/tezos-benchmarks-proto-alpha.opam @@ -28,7 +28,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-clic.opam b/opam/tezos-clic.opam index fb8da3b0ed05..202054d220f7 100644 --- a/opam/tezos-clic.opam +++ b/opam/tezos-clic.opam @@ -20,7 +20,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-000-Ps9mPmXa.opam b/opam/tezos-client-000-Ps9mPmXa.opam index 9e674739be9b..b49716b90853 100644 --- a/opam/tezos-client-000-Ps9mPmXa.opam +++ b/opam/tezos-client-000-Ps9mPmXa.opam @@ -20,7 +20,7 @@ depends: [ "tezos-stdlib-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-001-PtCJ7pwo.opam b/opam/tezos-client-001-PtCJ7pwo.opam index c2da38a1d003..a9850c3fd712 100644 --- a/opam/tezos-client-001-PtCJ7pwo.opam +++ b/opam/tezos-client-001-PtCJ7pwo.opam @@ -23,7 +23,7 @@ depends: [ "tezos-client-commands" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-002-PsYLVpVv.opam b/opam/tezos-client-002-PsYLVpVv.opam index cd13e5891cc2..e710cd55badd 100644 --- a/opam/tezos-client-002-PsYLVpVv.opam +++ b/opam/tezos-client-002-PsYLVpVv.opam @@ -23,7 +23,7 @@ depends: [ "tezos-client-commands" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-003-PsddFKi3.opam b/opam/tezos-client-003-PsddFKi3.opam index 695d86deb350..84112f033898 100644 --- a/opam/tezos-client-003-PsddFKi3.opam +++ b/opam/tezos-client-003-PsddFKi3.opam @@ -23,7 +23,7 @@ depends: [ "tezos-client-commands" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-004-Pt24m4xi.opam b/opam/tezos-client-004-Pt24m4xi.opam index eed3ad4aee13..796cc57a3b72 100644 --- a/opam/tezos-client-004-Pt24m4xi.opam +++ b/opam/tezos-client-004-Pt24m4xi.opam @@ -23,7 +23,7 @@ depends: [ "tezos-client-commands" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-005-PsBabyM1.opam b/opam/tezos-client-005-PsBabyM1.opam index c2ab6573a647..337817d8863c 100644 --- a/opam/tezos-client-005-PsBabyM1.opam +++ b/opam/tezos-client-005-PsBabyM1.opam @@ -23,7 +23,7 @@ depends: [ "tezos-client-commands" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-006-PsCARTHA.opam b/opam/tezos-client-006-PsCARTHA.opam index 45235fc2d0a4..85db87d45964 100644 --- a/opam/tezos-client-006-PsCARTHA.opam +++ b/opam/tezos-client-006-PsCARTHA.opam @@ -23,7 +23,7 @@ depends: [ "tezos-client-commands" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-007-PsDELPH1.opam b/opam/tezos-client-007-PsDELPH1.opam index 7bac04368266..788f09fc84ae 100644 --- a/opam/tezos-client-007-PsDELPH1.opam +++ b/opam/tezos-client-007-PsDELPH1.opam @@ -24,7 +24,7 @@ depends: [ "tezos-client-commands" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/tezos-client-008-PtEdo2Zk.opam index a585686fb45e..2e2d48cc6eac 100644 --- a/opam/tezos-client-008-PtEdo2Zk.opam +++ b/opam/tezos-client-008-PtEdo2Zk.opam @@ -24,7 +24,7 @@ depends: [ "tezos-client-commands" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/tezos-client-009-PsFLoren.opam index 0e939920859e..76cdebf5c8a4 100644 --- a/opam/tezos-client-009-PsFLoren.opam +++ b/opam/tezos-client-009-PsFLoren.opam @@ -26,7 +26,7 @@ depends: [ "tezos-client-base-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/tezos-client-010-PtGRANAD.opam index 1af66b2cffce..e74186a73c26 100644 --- a/opam/tezos-client-010-PtGRANAD.opam +++ b/opam/tezos-client-010-PtGRANAD.opam @@ -26,7 +26,7 @@ depends: [ "tezos-client-base-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/tezos-client-011-PtHangz2.opam index 565caf8072a6..ee95682a9f95 100644 --- a/opam/tezos-client-011-PtHangz2.opam +++ b/opam/tezos-client-011-PtHangz2.opam @@ -31,7 +31,7 @@ depends: [ "tezos-crypto" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/tezos-client-012-Psithaca.opam index b75b9e70327e..0464337cc054 100644 --- a/opam/tezos-client-012-Psithaca.opam +++ b/opam/tezos-client-012-Psithaca.opam @@ -31,7 +31,7 @@ depends: [ "tezos-crypto" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/tezos-client-013-PtJakart.opam index bd0d3a9fdf12..9b0527ff28c5 100644 --- a/opam/tezos-client-013-PtJakart.opam +++ b/opam/tezos-client-013-PtJakart.opam @@ -31,7 +31,7 @@ depends: [ "tezos-crypto" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-014-PtKathma.opam b/opam/tezos-client-014-PtKathma.opam index c7d092fb9fbf..43293c36d385 100644 --- a/opam/tezos-client-014-PtKathma.opam +++ b/opam/tezos-client-014-PtKathma.opam @@ -31,7 +31,7 @@ depends: [ "tezos-crypto" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-015-PtLimaPt.opam b/opam/tezos-client-015-PtLimaPt.opam index 980fb4e2755b..c764c13a5ff7 100644 --- a/opam/tezos-client-015-PtLimaPt.opam +++ b/opam/tezos-client-015-PtLimaPt.opam @@ -31,7 +31,7 @@ depends: [ "tezos-crypto" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-016-PtMumbai.opam b/opam/tezos-client-016-PtMumbai.opam index bcdc209fa226..fa13febf35d0 100644 --- a/opam/tezos-client-016-PtMumbai.opam +++ b/opam/tezos-client-016-PtMumbai.opam @@ -38,7 +38,7 @@ depends: [ "qcheck-alcotest" { with-test & >= "0.20" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-017-PtNairob.opam b/opam/tezos-client-017-PtNairob.opam index 3005825c56f3..cbbc8b8b53e6 100644 --- a/opam/tezos-client-017-PtNairob.opam +++ b/opam/tezos-client-017-PtNairob.opam @@ -38,7 +38,7 @@ depends: [ "qcheck-alcotest" { with-test & >= "0.20" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam index 547eb8b66614..0edbcf143f9f 100644 --- a/opam/tezos-client-alpha.opam +++ b/opam/tezos-client-alpha.opam @@ -38,7 +38,7 @@ depends: [ "qcheck-alcotest" { with-test & >= "0.20" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-base-unix.opam b/opam/tezos-client-base-unix.opam index 891d347e6c63..866f4d2974ce 100644 --- a/opam/tezos-client-base-unix.opam +++ b/opam/tezos-client-base-unix.opam @@ -31,7 +31,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-base.opam b/opam/tezos-client-base.opam index 3c5da340b064..a0142e085601 100644 --- a/opam/tezos-client-base.opam +++ b/opam/tezos-client-base.opam @@ -20,7 +20,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-commands.opam b/opam/tezos-client-commands.opam index b458c09745b4..32c141360222 100644 --- a/opam/tezos-client-commands.opam +++ b/opam/tezos-client-commands.opam @@ -22,7 +22,7 @@ depends: [ "uri" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-demo-counter.opam b/opam/tezos-client-demo-counter.opam index 952e36b34674..9d2a6c09b154 100644 --- a/opam/tezos-client-demo-counter.opam +++ b/opam/tezos-client-demo-counter.opam @@ -17,7 +17,7 @@ depends: [ "tezos-protocol-demo-counter" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-client-genesis.opam b/opam/tezos-client-genesis.opam index 923ca9883693..edbc26fc82ac 100644 --- a/opam/tezos-client-genesis.opam +++ b/opam/tezos-client-genesis.opam @@ -20,7 +20,7 @@ depends: [ "tezos-stdlib-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-context-ops.opam b/opam/tezos-context-ops.opam index 262d212ef07f..48f73d92f16f 100644 --- a/opam/tezos-context-ops.opam +++ b/opam/tezos-context-ops.opam @@ -17,7 +17,7 @@ depends: [ "tezos-shell-context" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-context.opam b/opam/tezos-context.opam index 4e2ab17a0a24..5675aab8b3df 100644 --- a/opam/tezos-context.opam +++ b/opam/tezos-context.opam @@ -27,7 +27,7 @@ conflicts: [ "checkseum" { = "0.5.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-crypto-dal.opam b/opam/tezos-crypto-dal.opam index 8f60a186c26d..d05a1fc16fab 100644 --- a/opam/tezos-crypto-dal.opam +++ b/opam/tezos-crypto-dal.opam @@ -22,7 +22,7 @@ depends: [ "tezos-test-helpers" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-crypto.opam b/opam/tezos-crypto.opam index b18acc7cbb9e..415aca8d2881 100644 --- a/opam/tezos-crypto.opam +++ b/opam/tezos-crypto.opam @@ -29,7 +29,7 @@ depends: [ "tezos-test-helpers" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-dac-017-PtNairob.opam b/opam/tezos-dac-017-PtNairob.opam index faac988bb31e..9859b863651a 100644 --- a/opam/tezos-dac-017-PtNairob.opam +++ b/opam/tezos-dac-017-PtNairob.opam @@ -26,7 +26,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-dac-alpha.opam b/opam/tezos-dac-alpha.opam index 5881dfe29b6f..88462e4ae5df 100644 --- a/opam/tezos-dac-alpha.opam +++ b/opam/tezos-dac-alpha.opam @@ -26,7 +26,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-dac-client-lib.opam b/opam/tezos-dac-client-lib.opam index 7594af17670d..ba81d9937b6a 100644 --- a/opam/tezos-dac-client-lib.opam +++ b/opam/tezos-dac-client-lib.opam @@ -17,7 +17,7 @@ depends: [ "tezos-dac-lib" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-dac-lib-test.opam b/opam/tezos-dac-lib-test.opam index 43e79a866820..cbd3bea79812 100644 --- a/opam/tezos-dac-lib-test.opam +++ b/opam/tezos-dac-lib-test.opam @@ -20,7 +20,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-dac-lib.opam b/opam/tezos-dac-lib.opam index 9a4ccb39569a..4d8f96964a15 100644 --- a/opam/tezos-dac-lib.opam +++ b/opam/tezos-dac-lib.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-updater" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-dac-node-lib-test.opam b/opam/tezos-dac-node-lib-test.opam index 71e5c5b068db..4258eee43e13 100644 --- a/opam/tezos-dac-node-lib-test.opam +++ b/opam/tezos-dac-node-lib-test.opam @@ -20,7 +20,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-dac-node-lib.opam b/opam/tezos-dac-node-lib.opam index 0aa7c1050df0..e592ff93f04f 100644 --- a/opam/tezos-dac-node-lib.opam +++ b/opam/tezos-dac-node-lib.opam @@ -20,7 +20,7 @@ depends: [ "tezos-dac-client-lib" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-dal-016-PtMumbai.opam b/opam/tezos-dal-016-PtMumbai.opam index 595346daf66a..54dcaf6c4a07 100644 --- a/opam/tezos-dal-016-PtMumbai.opam +++ b/opam/tezos-dal-016-PtMumbai.opam @@ -26,7 +26,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-dal-017-PtNairob.opam b/opam/tezos-dal-017-PtNairob.opam index a70f0de5fb13..79ab7ae7204d 100644 --- a/opam/tezos-dal-017-PtNairob.opam +++ b/opam/tezos-dal-017-PtNairob.opam @@ -26,7 +26,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-dal-alpha.opam b/opam/tezos-dal-alpha.opam index 1e7785e7fc03..59d4c243ec4c 100644 --- a/opam/tezos-dal-alpha.opam +++ b/opam/tezos-dal-alpha.opam @@ -26,7 +26,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-dal-node-lib.opam b/opam/tezos-dal-node-lib.opam index 9966cd5085d9..9217fffacca0 100644 --- a/opam/tezos-dal-node-lib.opam +++ b/opam/tezos-dal-node-lib.opam @@ -23,7 +23,7 @@ depends: [ "tezos-crypto" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-dal-node-services.opam b/opam/tezos-dal-node-services.opam index e81e44f90c82..b65889ca1af8 100644 --- a/opam/tezos-dal-node-services.opam +++ b/opam/tezos-dal-node-services.opam @@ -15,7 +15,7 @@ depends: [ "tezos-crypto-dal" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam index 3a00e07e317e..1649a91d3c64 100644 --- a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam index aa116496718b..8ed178a429d6 100644 --- a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam index 4a5e513cf906..78b83b105e3e 100644 --- a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-003-PsddFKi3.opam b/opam/tezos-embedded-protocol-003-PsddFKi3.opam index 60a126fc7c79..7ec5fe9a13f5 100644 --- a/opam/tezos-embedded-protocol-003-PsddFKi3.opam +++ b/opam/tezos-embedded-protocol-003-PsddFKi3.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam index 24f34239c8fc..0fc77abdefd2 100644 --- a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-005-PsBABY5H.opam b/opam/tezos-embedded-protocol-005-PsBABY5H.opam index c716326d1d9d..87633ee732d6 100644 --- a/opam/tezos-embedded-protocol-005-PsBABY5H.opam +++ b/opam/tezos-embedded-protocol-005-PsBABY5H.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-005-PsBabyM1.opam b/opam/tezos-embedded-protocol-005-PsBabyM1.opam index 696943c72dca..38814b98cb2f 100644 --- a/opam/tezos-embedded-protocol-005-PsBabyM1.opam +++ b/opam/tezos-embedded-protocol-005-PsBabyM1.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-006-PsCARTHA.opam b/opam/tezos-embedded-protocol-006-PsCARTHA.opam index f0f48fcd09c0..c0b21749be74 100644 --- a/opam/tezos-embedded-protocol-006-PsCARTHA.opam +++ b/opam/tezos-embedded-protocol-006-PsCARTHA.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-007-PsDELPH1.opam b/opam/tezos-embedded-protocol-007-PsDELPH1.opam index 39a251507b4b..365e6ae15496 100644 --- a/opam/tezos-embedded-protocol-007-PsDELPH1.opam +++ b/opam/tezos-embedded-protocol-007-PsDELPH1.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam index 55e8aec35df7..025862819b6e 100644 --- a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-008-PtEdoTez.opam b/opam/tezos-embedded-protocol-008-PtEdoTez.opam index 952e2da53e40..0113da93ff8c 100644 --- a/opam/tezos-embedded-protocol-008-PtEdoTez.opam +++ b/opam/tezos-embedded-protocol-008-PtEdoTez.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-009-PsFLoren.opam b/opam/tezos-embedded-protocol-009-PsFLoren.opam index 410c358a4c8d..0921ea850d6b 100644 --- a/opam/tezos-embedded-protocol-009-PsFLoren.opam +++ b/opam/tezos-embedded-protocol-009-PsFLoren.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-010-PtGRANAD.opam b/opam/tezos-embedded-protocol-010-PtGRANAD.opam index 4885258e4aab..f4f2cb8655ca 100644 --- a/opam/tezos-embedded-protocol-010-PtGRANAD.opam +++ b/opam/tezos-embedded-protocol-010-PtGRANAD.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-011-PtHangz2.opam b/opam/tezos-embedded-protocol-011-PtHangz2.opam index d5999d7e01e4..c42db712afb2 100644 --- a/opam/tezos-embedded-protocol-011-PtHangz2.opam +++ b/opam/tezos-embedded-protocol-011-PtHangz2.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-012-Psithaca.opam b/opam/tezos-embedded-protocol-012-Psithaca.opam index f11dde981588..86b6e8a1492f 100644 --- a/opam/tezos-embedded-protocol-012-Psithaca.opam +++ b/opam/tezos-embedded-protocol-012-Psithaca.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-013-PtJakart.opam b/opam/tezos-embedded-protocol-013-PtJakart.opam index f8d307315c89..1073048fb633 100644 --- a/opam/tezos-embedded-protocol-013-PtJakart.opam +++ b/opam/tezos-embedded-protocol-013-PtJakart.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-014-PtKathma.opam b/opam/tezos-embedded-protocol-014-PtKathma.opam index 6190f85022af..212b279f442a 100644 --- a/opam/tezos-embedded-protocol-014-PtKathma.opam +++ b/opam/tezos-embedded-protocol-014-PtKathma.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-015-PtLimaPt.opam b/opam/tezos-embedded-protocol-015-PtLimaPt.opam index 18ab93075a01..b3138f154fe3 100644 --- a/opam/tezos-embedded-protocol-015-PtLimaPt.opam +++ b/opam/tezos-embedded-protocol-015-PtLimaPt.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-016-PtMumbai.opam b/opam/tezos-embedded-protocol-016-PtMumbai.opam index 5fc454312681..18f4669f077e 100644 --- a/opam/tezos-embedded-protocol-016-PtMumbai.opam +++ b/opam/tezos-embedded-protocol-016-PtMumbai.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-017-PtNairob.opam b/opam/tezos-embedded-protocol-017-PtNairob.opam index c7eae26069c1..eae5b0864d4a 100644 --- a/opam/tezos-embedded-protocol-017-PtNairob.opam +++ b/opam/tezos-embedded-protocol-017-PtNairob.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-alpha.opam b/opam/tezos-embedded-protocol-alpha.opam index 5660489100b2..7ec701a4c104 100644 --- a/opam/tezos-embedded-protocol-alpha.opam +++ b/opam/tezos-embedded-protocol-alpha.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-demo-counter.opam b/opam/tezos-embedded-protocol-demo-counter.opam index bddeefde6683..55758942e39e 100644 --- a/opam/tezos-embedded-protocol-demo-counter.opam +++ b/opam/tezos-embedded-protocol-demo-counter.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-demo-noops.opam b/opam/tezos-embedded-protocol-demo-noops.opam index 67dcea239646..8d5e0e2ce7d0 100644 --- a/opam/tezos-embedded-protocol-demo-noops.opam +++ b/opam/tezos-embedded-protocol-demo-noops.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-embedded-protocol-genesis.opam b/opam/tezos-embedded-protocol-genesis.opam index 872c3725af35..6d389d190e19 100644 --- a/opam/tezos-embedded-protocol-genesis.opam +++ b/opam/tezos-embedded-protocol-genesis.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-error-monad.opam b/opam/tezos-error-monad.opam index bd2d13e4c11e..f8c1d230067c 100644 --- a/opam/tezos-error-monad.opam +++ b/opam/tezos-error-monad.opam @@ -22,7 +22,7 @@ conflicts: [ "result" { < "1.5" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-event-logging-test-helpers.opam b/opam/tezos-event-logging-test-helpers.opam index da842a3c3272..9f01ecdd7fcc 100644 --- a/opam/tezos-event-logging-test-helpers.opam +++ b/opam/tezos-event-logging-test-helpers.opam @@ -19,7 +19,7 @@ depends: [ "octez-alcotezt" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-event-logging.opam b/opam/tezos-event-logging.opam index 2e55d3f300e0..bef7e4c2f679 100644 --- a/opam/tezos-event-logging.opam +++ b/opam/tezos-event-logging.opam @@ -18,7 +18,7 @@ depends: [ "uri" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-expect-helper.opam b/opam/tezos-expect-helper.opam index ec5502d38e2d..fb30ea0ddbe4 100644 --- a/opam/tezos-expect-helper.opam +++ b/opam/tezos-expect-helper.opam @@ -13,7 +13,7 @@ depends: [ "ppx_expect" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-gossipsub-test.opam b/opam/tezos-gossipsub-test.opam index b065137c9999..9abf3426c7f9 100644 --- a/opam/tezos-gossipsub-test.opam +++ b/opam/tezos-gossipsub-test.opam @@ -18,7 +18,7 @@ depends: [ "tezos-test-helpers" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-gossipsub.opam b/opam/tezos-gossipsub.opam index 3c83019aefbf..4c6e03da474f 100644 --- a/opam/tezos-gossipsub.opam +++ b/opam/tezos-gossipsub.opam @@ -20,7 +20,7 @@ depends: [ "tezos-version" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-hacl.opam b/opam/tezos-hacl.opam index 365093465943..9333274fd7f0 100644 --- a/opam/tezos-hacl.opam +++ b/opam/tezos-hacl.opam @@ -30,7 +30,7 @@ conflicts: [ "hacl_x25519" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-layer2-store.opam b/opam/tezos-layer2-store.opam index d1f880b5386a..d5d7a7ed156c 100644 --- a/opam/tezos-layer2-store.opam +++ b/opam/tezos-layer2-store.opam @@ -26,7 +26,7 @@ conflicts: [ "checkseum" { = "0.5.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-layer2-utils-016-PtMumbai.opam b/opam/tezos-layer2-utils-016-PtMumbai.opam index 75976a5d6284..ad89d5a09e33 100644 --- a/opam/tezos-layer2-utils-016-PtMumbai.opam +++ b/opam/tezos-layer2-utils-016-PtMumbai.opam @@ -16,7 +16,7 @@ depends: [ "tezos-client-016-PtMumbai" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-layer2-utils-017-PtNairob.opam b/opam/tezos-layer2-utils-017-PtNairob.opam index b4cfd6669bf4..1aeba5ea800b 100644 --- a/opam/tezos-layer2-utils-017-PtNairob.opam +++ b/opam/tezos-layer2-utils-017-PtNairob.opam @@ -16,7 +16,7 @@ depends: [ "tezos-client-017-PtNairob" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-layer2-utils-alpha.opam b/opam/tezos-layer2-utils-alpha.opam index faaf4f43e59d..94c965c1f597 100644 --- a/opam/tezos-layer2-utils-alpha.opam +++ b/opam/tezos-layer2-utils-alpha.opam @@ -16,7 +16,7 @@ depends: [ "tezos-client-alpha" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-lazy-containers-tests.opam b/opam/tezos-lazy-containers-tests.opam index eb2f132ea37b..94b5cea77a38 100644 --- a/opam/tezos-lazy-containers-tests.opam +++ b/opam/tezos-lazy-containers-tests.opam @@ -18,7 +18,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-lazy-containers.opam b/opam/tezos-lazy-containers.opam index b66074b996a4..a1085c7c4763 100644 --- a/opam/tezos-lazy-containers.opam +++ b/opam/tezos-lazy-containers.opam @@ -14,7 +14,7 @@ depends: [ "tezos-tree-encoding" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-lwt-result-stdlib.opam b/opam/tezos-lwt-result-stdlib.opam index c4cbaa485b1c..3a4b1ec3e772 100644 --- a/opam/tezos-lwt-result-stdlib.opam +++ b/opam/tezos-lwt-result-stdlib.opam @@ -18,7 +18,7 @@ depends: [ "tezos-test-helpers" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] { with-test & arch != "arm32" & arch != "x86_32" } ] diff --git a/opam/tezos-micheline-rewriting.opam b/opam/tezos-micheline-rewriting.opam index 0fc2f0f9d3d3..b3fb108c368c 100644 --- a/opam/tezos-micheline-rewriting.opam +++ b/opam/tezos-micheline-rewriting.opam @@ -21,7 +21,7 @@ depends: [ "tezos-client-alpha" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-micheline.opam b/opam/tezos-micheline.opam index 5b5358c94f1d..4989139cbfd7 100644 --- a/opam/tezos-micheline.opam +++ b/opam/tezos-micheline.opam @@ -19,7 +19,7 @@ depends: [ "data-encoding" { >= "0.7.1" & < "1.0.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-mockup-commands.opam b/opam/tezos-mockup-commands.opam index 8ed94dfa9cf8..e66b354ec976 100644 --- a/opam/tezos-mockup-commands.opam +++ b/opam/tezos-mockup-commands.opam @@ -18,7 +18,7 @@ depends: [ "tezos-mockup-registration" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-mockup-proxy.opam b/opam/tezos-mockup-proxy.opam index d0984756cf08..56c16273dcb0 100644 --- a/opam/tezos-mockup-proxy.opam +++ b/opam/tezos-mockup-proxy.opam @@ -20,7 +20,7 @@ depends: [ "uri" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-mockup-registration.opam b/opam/tezos-mockup-registration.opam index 7cbb231880d2..344ef6a5de81 100644 --- a/opam/tezos-mockup-registration.opam +++ b/opam/tezos-mockup-registration.opam @@ -17,7 +17,7 @@ depends: [ "uri" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-mockup.opam b/opam/tezos-mockup.opam index aafa484a0df4..7abb77e81e79 100644 --- a/opam/tezos-mockup.opam +++ b/opam/tezos-mockup.opam @@ -29,7 +29,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-openapi.opam b/opam/tezos-openapi.opam index 844b879a754b..df682555378e 100644 --- a/opam/tezos-openapi.opam +++ b/opam/tezos-openapi.opam @@ -15,7 +15,7 @@ depends: [ "tezt" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-p2p-services.opam b/opam/tezos-p2p-services.opam index b76c9ec83aea..920a4de49cbd 100644 --- a/opam/tezos-p2p-services.opam +++ b/opam/tezos-p2p-services.opam @@ -14,7 +14,7 @@ depends: [ "tezos-rpc" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-p2p.opam b/opam/tezos-p2p.opam index 636d526a8b9a..559b406c7ebf 100644 --- a/opam/tezos-p2p.opam +++ b/opam/tezos-p2p.opam @@ -29,7 +29,7 @@ depends: [ "tezt" { with-test & >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-000-Ps9mPmXa.opam b/opam/tezos-protocol-000-Ps9mPmXa.opam index 8aa26d264c07..699f3b6edcf9 100644 --- a/opam/tezos-protocol-000-Ps9mPmXa.opam +++ b/opam/tezos-protocol-000-Ps9mPmXa.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-001-PtCJ7pwo.opam b/opam/tezos-protocol-001-PtCJ7pwo.opam index 3b542c27f061..8114ad316ef1 100644 --- a/opam/tezos-protocol-001-PtCJ7pwo.opam +++ b/opam/tezos-protocol-001-PtCJ7pwo.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-002-PsYLVpVv.opam b/opam/tezos-protocol-002-PsYLVpVv.opam index acff93255f36..fd42129068dd 100644 --- a/opam/tezos-protocol-002-PsYLVpVv.opam +++ b/opam/tezos-protocol-002-PsYLVpVv.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-003-PsddFKi3.opam b/opam/tezos-protocol-003-PsddFKi3.opam index 453ad0cdfe3f..9192c8ed3e33 100644 --- a/opam/tezos-protocol-003-PsddFKi3.opam +++ b/opam/tezos-protocol-003-PsddFKi3.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-004-Pt24m4xi.opam b/opam/tezos-protocol-004-Pt24m4xi.opam index e3b7e5ce7fa9..2fbea512e3b2 100644 --- a/opam/tezos-protocol-004-Pt24m4xi.opam +++ b/opam/tezos-protocol-004-Pt24m4xi.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-005-PsBABY5H.opam b/opam/tezos-protocol-005-PsBABY5H.opam index e3b7e5ce7fa9..2fbea512e3b2 100644 --- a/opam/tezos-protocol-005-PsBABY5H.opam +++ b/opam/tezos-protocol-005-PsBABY5H.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-005-PsBabyM1.opam b/opam/tezos-protocol-005-PsBabyM1.opam index e3b7e5ce7fa9..2fbea512e3b2 100644 --- a/opam/tezos-protocol-005-PsBabyM1.opam +++ b/opam/tezos-protocol-005-PsBabyM1.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-006-PsCARTHA.opam b/opam/tezos-protocol-006-PsCARTHA.opam index e3b7e5ce7fa9..2fbea512e3b2 100644 --- a/opam/tezos-protocol-006-PsCARTHA.opam +++ b/opam/tezos-protocol-006-PsCARTHA.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-007-PsDELPH1.opam b/opam/tezos-protocol-007-PsDELPH1.opam index e3b7e5ce7fa9..2fbea512e3b2 100644 --- a/opam/tezos-protocol-007-PsDELPH1.opam +++ b/opam/tezos-protocol-007-PsDELPH1.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-008-PtEdo2Zk.opam b/opam/tezos-protocol-008-PtEdo2Zk.opam index e3b7e5ce7fa9..2fbea512e3b2 100644 --- a/opam/tezos-protocol-008-PtEdo2Zk.opam +++ b/opam/tezos-protocol-008-PtEdo2Zk.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-008-PtEdoTez.opam b/opam/tezos-protocol-008-PtEdoTez.opam index e3b7e5ce7fa9..2fbea512e3b2 100644 --- a/opam/tezos-protocol-008-PtEdoTez.opam +++ b/opam/tezos-protocol-008-PtEdoTez.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-009-PsFLoren.opam b/opam/tezos-protocol-009-PsFLoren.opam index e3b7e5ce7fa9..2fbea512e3b2 100644 --- a/opam/tezos-protocol-009-PsFLoren.opam +++ b/opam/tezos-protocol-009-PsFLoren.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-010-PtGRANAD.opam b/opam/tezos-protocol-010-PtGRANAD.opam index e3b7e5ce7fa9..2fbea512e3b2 100644 --- a/opam/tezos-protocol-010-PtGRANAD.opam +++ b/opam/tezos-protocol-010-PtGRANAD.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-011-PtHangz2.opam b/opam/tezos-protocol-011-PtHangz2.opam index 59f5b6b0b44a..dad3f88b6298 100644 --- a/opam/tezos-protocol-011-PtHangz2.opam +++ b/opam/tezos-protocol-011-PtHangz2.opam @@ -14,7 +14,7 @@ depends: [ "tezos-base" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-012-Psithaca.opam b/opam/tezos-protocol-012-Psithaca.opam index 59f5b6b0b44a..dad3f88b6298 100644 --- a/opam/tezos-protocol-012-Psithaca.opam +++ b/opam/tezos-protocol-012-Psithaca.opam @@ -14,7 +14,7 @@ depends: [ "tezos-base" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-013-PtJakart.opam b/opam/tezos-protocol-013-PtJakart.opam index 59f5b6b0b44a..dad3f88b6298 100644 --- a/opam/tezos-protocol-013-PtJakart.opam +++ b/opam/tezos-protocol-013-PtJakart.opam @@ -14,7 +14,7 @@ depends: [ "tezos-base" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-014-PtKathma.opam b/opam/tezos-protocol-014-PtKathma.opam index 59f5b6b0b44a..dad3f88b6298 100644 --- a/opam/tezos-protocol-014-PtKathma.opam +++ b/opam/tezos-protocol-014-PtKathma.opam @@ -14,7 +14,7 @@ depends: [ "tezos-base" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-015-PtLimaPt.opam b/opam/tezos-protocol-015-PtLimaPt.opam index 59f5b6b0b44a..dad3f88b6298 100644 --- a/opam/tezos-protocol-015-PtLimaPt.opam +++ b/opam/tezos-protocol-015-PtLimaPt.opam @@ -14,7 +14,7 @@ depends: [ "tezos-base" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-016-PtMumbai-tests.opam b/opam/tezos-protocol-016-PtMumbai-tests.opam index 51e055e80dfe..3b1b83ecbf01 100644 --- a/opam/tezos-protocol-016-PtMumbai-tests.opam +++ b/opam/tezos-protocol-016-PtMumbai-tests.opam @@ -37,7 +37,7 @@ depends: [ "tezos-webassembly-interpreter-extra" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-016-PtMumbai.opam b/opam/tezos-protocol-016-PtMumbai.opam index 59f5b6b0b44a..dad3f88b6298 100644 --- a/opam/tezos-protocol-016-PtMumbai.opam +++ b/opam/tezos-protocol-016-PtMumbai.opam @@ -14,7 +14,7 @@ depends: [ "tezos-base" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-017-PtNairob-tests.opam b/opam/tezos-protocol-017-PtNairob-tests.opam index 24e6dc306f53..50a68e2f73ca 100644 --- a/opam/tezos-protocol-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-017-PtNairob-tests.opam @@ -37,7 +37,7 @@ depends: [ "tezos-webassembly-interpreter-extra" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-017-PtNairob.opam b/opam/tezos-protocol-017-PtNairob.opam index 59f5b6b0b44a..dad3f88b6298 100644 --- a/opam/tezos-protocol-017-PtNairob.opam +++ b/opam/tezos-protocol-017-PtNairob.opam @@ -14,7 +14,7 @@ depends: [ "tezos-base" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 187c709e7090..a5d8c47ec3ed 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -37,7 +37,7 @@ depends: [ "tezos-webassembly-interpreter-extra" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-alpha.opam b/opam/tezos-protocol-alpha.opam index 59f5b6b0b44a..dad3f88b6298 100644 --- a/opam/tezos-protocol-alpha.opam +++ b/opam/tezos-protocol-alpha.opam @@ -14,7 +14,7 @@ depends: [ "tezos-base" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-demo-counter.opam b/opam/tezos-protocol-demo-counter.opam index 216bca84a51e..cc0f3243e4bd 100644 --- a/opam/tezos-protocol-demo-counter.opam +++ b/opam/tezos-protocol-demo-counter.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-demo-noops.opam b/opam/tezos-protocol-demo-noops.opam index 98f4cb83c0e6..24bedd0b68ec 100644 --- a/opam/tezos-protocol-demo-noops.opam +++ b/opam/tezos-protocol-demo-noops.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-environment.opam b/opam/tezos-protocol-environment.opam index 311f64d40928..1c15846a38c5 100644 --- a/opam/tezos-protocol-environment.opam +++ b/opam/tezos-protocol-environment.opam @@ -35,7 +35,7 @@ depends: [ "lwt" { with-test & >= "5.6.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-genesis.opam b/opam/tezos-protocol-genesis.opam index 471d077a4401..006ac7f3d69a 100644 --- a/opam/tezos-protocol-genesis.opam +++ b/opam/tezos-protocol-genesis.opam @@ -13,7 +13,7 @@ depends: [ "tezos-protocol-environment" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam index bc9f4679581e..d169583ab899 100644 --- a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam +++ b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam @@ -16,7 +16,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1.opam b/opam/tezos-protocol-plugin-007-PsDELPH1.opam index aa2d166adfb0..3bcf7df73d16 100644 --- a/opam/tezos-protocol-plugin-007-PsDELPH1.opam +++ b/opam/tezos-protocol-plugin-007-PsDELPH1.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-007-PsDELPH1" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam index 7ee87971a122..32d999ca4333 100644 --- a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam +++ b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam @@ -16,7 +16,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam index 3f1f885c8cb6..4b9127994b07 100644 --- a/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam +++ b/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-008-PtEdo2Zk" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam index a1e464f3b37d..8fd16668fdb3 100644 --- a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam +++ b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam @@ -16,7 +16,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-009-PsFLoren.opam b/opam/tezos-protocol-plugin-009-PsFLoren.opam index 2d961620d7ec..de4a53f5af02 100644 --- a/opam/tezos-protocol-plugin-009-PsFLoren.opam +++ b/opam/tezos-protocol-plugin-009-PsFLoren.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-009-PsFLoren" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam index e645a364d577..19144e5d737b 100644 --- a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam +++ b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam @@ -16,7 +16,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD.opam b/opam/tezos-protocol-plugin-010-PtGRANAD.opam index f6aea474fa4b..e9f86acf78fc 100644 --- a/opam/tezos-protocol-plugin-010-PtGRANAD.opam +++ b/opam/tezos-protocol-plugin-010-PtGRANAD.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-010-PtGRANAD" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam index f85f268c8aa7..77cf70178849 100644 --- a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam +++ b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam @@ -16,7 +16,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-011-PtHangz2.opam b/opam/tezos-protocol-plugin-011-PtHangz2.opam index 0f54b801f657..35f1320fede5 100644 --- a/opam/tezos-protocol-plugin-011-PtHangz2.opam +++ b/opam/tezos-protocol-plugin-011-PtHangz2.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-011-PtHangz2" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam index 6ec7e8eeb7a6..00449b0d0ef0 100644 --- a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam +++ b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam @@ -16,7 +16,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-012-Psithaca.opam b/opam/tezos-protocol-plugin-012-Psithaca.opam index 96633daf4e54..a74200e5f9b0 100644 --- a/opam/tezos-protocol-plugin-012-Psithaca.opam +++ b/opam/tezos-protocol-plugin-012-Psithaca.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-012-Psithaca" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam index 3f540cad2b62..059cb99c0033 100644 --- a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam +++ b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam @@ -16,7 +16,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-013-PtJakart.opam b/opam/tezos-protocol-plugin-013-PtJakart.opam index 46b010048945..88c8c936dd37 100644 --- a/opam/tezos-protocol-plugin-013-PtJakart.opam +++ b/opam/tezos-protocol-plugin-013-PtJakart.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-013-PtJakart" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam index 831c43727c93..e024598ced02 100644 --- a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam +++ b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam @@ -16,7 +16,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-014-PtKathma.opam b/opam/tezos-protocol-plugin-014-PtKathma.opam index 8b9422f98388..4edaa354d44f 100644 --- a/opam/tezos-protocol-plugin-014-PtKathma.opam +++ b/opam/tezos-protocol-plugin-014-PtKathma.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-014-PtKathma" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam index 69d259bf47d5..f5f416327402 100644 --- a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam +++ b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam @@ -16,7 +16,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt.opam b/opam/tezos-protocol-plugin-015-PtLimaPt.opam index 852774bf464c..df66087ca891 100644 --- a/opam/tezos-protocol-plugin-015-PtLimaPt.opam +++ b/opam/tezos-protocol-plugin-015-PtLimaPt.opam @@ -14,7 +14,7 @@ depends: [ "tezos-protocol-015-PtLimaPt" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam index f283e4ac00cb..956e772a0c31 100644 --- a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam +++ b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam @@ -16,7 +16,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam b/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam index 08253de819e1..a7e8bcd2d917 100644 --- a/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam +++ b/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam @@ -23,7 +23,7 @@ depends: [ "tezos-016-PtMumbai-test-helpers" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-016-PtMumbai.opam b/opam/tezos-protocol-plugin-016-PtMumbai.opam index f7f614dad98c..453f3b0c6636 100644 --- a/opam/tezos-protocol-plugin-016-PtMumbai.opam +++ b/opam/tezos-protocol-plugin-016-PtMumbai.opam @@ -15,7 +15,7 @@ depends: [ "tezos-smart-rollup-016-PtMumbai" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam b/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam index f11ab3a39974..33e5a1f4094d 100644 --- a/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam +++ b/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam @@ -16,7 +16,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-017-PtNairob-tests.opam b/opam/tezos-protocol-plugin-017-PtNairob-tests.opam index 3422ca9a0473..5f31ffa26346 100644 --- a/opam/tezos-protocol-plugin-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-plugin-017-PtNairob-tests.opam @@ -23,7 +23,7 @@ depends: [ "tezos-017-PtNairob-test-helpers" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-017-PtNairob.opam b/opam/tezos-protocol-plugin-017-PtNairob.opam index a7f6ff100afe..ffa7d9a05d94 100644 --- a/opam/tezos-protocol-plugin-017-PtNairob.opam +++ b/opam/tezos-protocol-plugin-017-PtNairob.opam @@ -15,7 +15,7 @@ depends: [ "tezos-smart-rollup-017-PtNairob" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-alpha-registerer.opam b/opam/tezos-protocol-plugin-alpha-registerer.opam index ec51b5b1d9c6..fb72a67c2934 100644 --- a/opam/tezos-protocol-plugin-alpha-registerer.opam +++ b/opam/tezos-protocol-plugin-alpha-registerer.opam @@ -16,7 +16,7 @@ depends: [ "tezos-shell" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-alpha-tests.opam b/opam/tezos-protocol-plugin-alpha-tests.opam index b63b2cc5e8fc..b9b12cefccb7 100644 --- a/opam/tezos-protocol-plugin-alpha-tests.opam +++ b/opam/tezos-protocol-plugin-alpha-tests.opam @@ -23,7 +23,7 @@ depends: [ "tezos-alpha-test-helpers" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-plugin-alpha.opam b/opam/tezos-protocol-plugin-alpha.opam index 750701e9cc2a..8dc984f77845 100644 --- a/opam/tezos-protocol-plugin-alpha.opam +++ b/opam/tezos-protocol-plugin-alpha.opam @@ -15,7 +15,7 @@ depends: [ "tezos-smart-rollup-alpha" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-protocol-updater.opam b/opam/tezos-protocol-updater.opam index 17c8c4418562..af9e00ef0823 100644 --- a/opam/tezos-protocol-updater.opam +++ b/opam/tezos-protocol-updater.opam @@ -21,7 +21,7 @@ depends: [ "lwt-exit" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-proxy-server-config.opam b/opam/tezos-proxy-server-config.opam index 632a24230157..88761493bf30 100644 --- a/opam/tezos-proxy-server-config.opam +++ b/opam/tezos-proxy-server-config.opam @@ -19,7 +19,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-proxy.opam b/opam/tezos-proxy.opam index 339d6550ff7a..fbfb8065781e 100644 --- a/opam/tezos-proxy.opam +++ b/opam/tezos-proxy.opam @@ -31,7 +31,7 @@ depends: [ "qcheck-alcotest" { with-test & >= "0.20" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-requester.opam b/opam/tezos-requester.opam index 93411c7ac107..821312322c98 100644 --- a/opam/tezos-requester.opam +++ b/opam/tezos-requester.opam @@ -21,7 +21,7 @@ depends: [ "qcheck-alcotest" { with-test & >= "0.20" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-rpc-http-client-unix.opam b/opam/tezos-rpc-http-client-unix.opam index f4999936af61..f70597e9e8aa 100644 --- a/opam/tezos-rpc-http-client-unix.opam +++ b/opam/tezos-rpc-http-client-unix.opam @@ -18,7 +18,7 @@ depends: [ "tezos-rpc-http-client" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-rpc-http-client.opam b/opam/tezos-rpc-http-client.opam index cae42a15bb39..09c8baa0528a 100644 --- a/opam/tezos-rpc-http-client.opam +++ b/opam/tezos-rpc-http-client.opam @@ -16,7 +16,7 @@ depends: [ "tezos-rpc-http" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-rpc-http-server.opam b/opam/tezos-rpc-http-server.opam index 9a08bf0f2a28..d7e34f70990f 100644 --- a/opam/tezos-rpc-http-server.opam +++ b/opam/tezos-rpc-http-server.opam @@ -24,7 +24,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-rpc-http.opam b/opam/tezos-rpc-http.opam index fcf4611d0c49..af07f2b21fa9 100644 --- a/opam/tezos-rpc-http.opam +++ b/opam/tezos-rpc-http.opam @@ -16,7 +16,7 @@ depends: [ "uri" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-rpc.opam b/opam/tezos-rpc.opam index 512baf702eca..4864e6a8dae0 100644 --- a/opam/tezos-rpc.opam +++ b/opam/tezos-rpc.opam @@ -17,7 +17,7 @@ depends: [ "uri" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-sapling.opam b/opam/tezos-sapling.opam index ff47dde48c1c..08ab04ed437a 100644 --- a/opam/tezos-sapling.opam +++ b/opam/tezos-sapling.opam @@ -31,5 +31,5 @@ depends: [ x-opam-monorepo-opam-provided: [ "tezos-rust-libs" ] -build: [["rm" "-r" "vendors"] ["dune" "build" "-p" name "-j" jobs]] +build: [["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs]] synopsis: "OCaml library for the Sapling protocol, using librustzcash" diff --git a/opam/tezos-sc-rollup-node-test.opam b/opam/tezos-sc-rollup-node-test.opam index 36772d19d9c4..4e5d1fe918c7 100644 --- a/opam/tezos-sc-rollup-node-test.opam +++ b/opam/tezos-sc-rollup-node-test.opam @@ -31,7 +31,7 @@ depends: [ "tezt" { with-test & >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-scoru-wasm-durable-snapshot.opam b/opam/tezos-scoru-wasm-durable-snapshot.opam index b51cafdfcff4..83c2fcca1c2f 100644 --- a/opam/tezos-scoru-wasm-durable-snapshot.opam +++ b/opam/tezos-scoru-wasm-durable-snapshot.opam @@ -17,7 +17,7 @@ depends: [ "tezos-webassembly-interpreter-extra" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-scoru-wasm-fast-test.opam b/opam/tezos-scoru-wasm-fast-test.opam index 7f622e5172a3..dc9162793e2e 100644 --- a/opam/tezos-scoru-wasm-fast-test.opam +++ b/opam/tezos-scoru-wasm-fast-test.opam @@ -26,7 +26,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-scoru-wasm-fast.opam b/opam/tezos-scoru-wasm-fast.opam index d626ee3b7b43..aa11d05296f6 100644 --- a/opam/tezos-scoru-wasm-fast.opam +++ b/opam/tezos-scoru-wasm-fast.opam @@ -18,7 +18,7 @@ depends: [ "tezos-wasmer" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-scoru-wasm-helpers.opam b/opam/tezos-scoru-wasm-helpers.opam index f5dc13238b58..2379f2f64bca 100644 --- a/opam/tezos-scoru-wasm-helpers.opam +++ b/opam/tezos-scoru-wasm-helpers.opam @@ -20,7 +20,7 @@ depends: [ "tezos-webassembly-interpreter-extra" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-scoru-wasm-regressions.opam b/opam/tezos-scoru-wasm-regressions.opam index 62d2fb754245..1e94f850eef1 100644 --- a/opam/tezos-scoru-wasm-regressions.opam +++ b/opam/tezos-scoru-wasm-regressions.opam @@ -20,7 +20,7 @@ depends: [ "tezt" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-scoru-wasm-test-helpers.opam b/opam/tezos-scoru-wasm-test-helpers.opam index 5b06e2fd1155..8594717ba6dd 100644 --- a/opam/tezos-scoru-wasm-test-helpers.opam +++ b/opam/tezos-scoru-wasm-test-helpers.opam @@ -26,7 +26,7 @@ depends: [ "tezos-webassembly-interpreter-extra" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-scoru-wasm-test.opam b/opam/tezos-scoru-wasm-test.opam index b9890eeda8f3..0d690aa1543b 100644 --- a/opam/tezos-scoru-wasm-test.opam +++ b/opam/tezos-scoru-wasm-test.opam @@ -26,7 +26,7 @@ depends: [ "tezos-webassembly-interpreter-extra" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-scoru-wasm.opam b/opam/tezos-scoru-wasm.opam index de5b5b93640c..e21ef5d79822 100644 --- a/opam/tezos-scoru-wasm.opam +++ b/opam/tezos-scoru-wasm.opam @@ -19,7 +19,7 @@ depends: [ "data-encoding" { >= "0.7.1" & < "1.0.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-shell-benchmarks.opam b/opam/tezos-shell-benchmarks.opam index 6d258ca0076d..3310334a4e7d 100644 --- a/opam/tezos-shell-benchmarks.opam +++ b/opam/tezos-shell-benchmarks.opam @@ -20,7 +20,7 @@ depends: [ "tezos-micheline" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-shell-context-test.opam b/opam/tezos-shell-context-test.opam index 176b296bf6f1..b6dbca1be34a 100644 --- a/opam/tezos-shell-context-test.opam +++ b/opam/tezos-shell-context-test.opam @@ -18,7 +18,7 @@ depends: [ "tezos-protocol-environment" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-shell-context.opam b/opam/tezos-shell-context.opam index ade5012e5110..4e5d1eb76f17 100644 --- a/opam/tezos-shell-context.opam +++ b/opam/tezos-shell-context.opam @@ -15,7 +15,7 @@ depends: [ "tezos-context" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-shell-services.opam b/opam/tezos-shell-services.opam index 2ac6b9093867..c6c727e4a7e9 100644 --- a/opam/tezos-shell-services.opam +++ b/opam/tezos-shell-services.opam @@ -19,7 +19,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-shell.opam b/opam/tezos-shell.opam index 3d72479b0808..ef3af1b61545 100644 --- a/opam/tezos-shell.opam +++ b/opam/tezos-shell.opam @@ -39,7 +39,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam index 5944f94b4f37..533eb72a3650 100644 --- a/opam/tezos-signer-backends.opam +++ b/opam/tezos-signer-backends.opam @@ -35,7 +35,7 @@ conflicts: [ "ledgerwallet-tezos" { < "0.3.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-signer-services.opam b/opam/tezos-signer-services.opam index ff688997b9d4..bd149321c4c4 100644 --- a/opam/tezos-signer-services.opam +++ b/opam/tezos-signer-services.opam @@ -15,7 +15,7 @@ depends: [ "tezos-client-base" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-smart-rollup-016-PtMumbai.opam b/opam/tezos-smart-rollup-016-PtMumbai.opam index 18eb0ec2b809..4fbfc652a0a3 100644 --- a/opam/tezos-smart-rollup-016-PtMumbai.opam +++ b/opam/tezos-smart-rollup-016-PtMumbai.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-016-PtMumbai" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-smart-rollup-017-PtNairob.opam b/opam/tezos-smart-rollup-017-PtNairob.opam index af95e83291e6..28b4ef502e33 100644 --- a/opam/tezos-smart-rollup-017-PtNairob.opam +++ b/opam/tezos-smart-rollup-017-PtNairob.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-017-PtNairob" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-smart-rollup-alpha.opam b/opam/tezos-smart-rollup-alpha.opam index 46d3f7f80f1a..325e9d291298 100644 --- a/opam/tezos-smart-rollup-alpha.opam +++ b/opam/tezos-smart-rollup-alpha.opam @@ -15,7 +15,7 @@ depends: [ "tezos-protocol-alpha" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam b/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam index 18bc6cb04412..fa0f735a04f3 100644 --- a/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam +++ b/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam @@ -16,7 +16,7 @@ depends: [ "octez-injector" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-smart-rollup-layer2-017-PtNairob.opam b/opam/tezos-smart-rollup-layer2-017-PtNairob.opam index 05c905576363..89154c63e3db 100644 --- a/opam/tezos-smart-rollup-layer2-017-PtNairob.opam +++ b/opam/tezos-smart-rollup-layer2-017-PtNairob.opam @@ -16,7 +16,7 @@ depends: [ "octez-injector" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-smart-rollup-layer2-alpha.opam b/opam/tezos-smart-rollup-layer2-alpha.opam index 5e0b7af27672..3559d0eccb36 100644 --- a/opam/tezos-smart-rollup-layer2-alpha.opam +++ b/opam/tezos-smart-rollup-layer2-alpha.opam @@ -16,7 +16,7 @@ depends: [ "octez-injector" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-stdlib-unix.opam b/opam/tezos-stdlib-unix.opam index eb487cc77d48..2f2385101752 100644 --- a/opam/tezos-stdlib-unix.opam +++ b/opam/tezos-stdlib-unix.opam @@ -33,7 +33,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-stdlib.opam b/opam/tezos-stdlib.opam index 3183c9a298c3..2a47b7462360 100644 --- a/opam/tezos-stdlib.opam +++ b/opam/tezos-stdlib.opam @@ -24,7 +24,7 @@ depends: [ "lwt_log" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-store.opam b/opam/tezos-store.opam index 3c344f395137..1b5c742b6d82 100644 --- a/opam/tezos-store.opam +++ b/opam/tezos-store.opam @@ -45,7 +45,7 @@ conflicts: [ "checkseum" { = "0.5.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-test-helpers.opam b/opam/tezos-test-helpers.opam index 2d53ec60b91c..c1a744e59824 100644 --- a/opam/tezos-test-helpers.opam +++ b/opam/tezos-test-helpers.opam @@ -18,7 +18,7 @@ depends: [ "data-encoding" { >= "0.7.1" & < "1.0.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-tooling.opam b/opam/tezos-tooling.opam index 5a9ed3cf4a62..0e91c2b5c7a8 100644 --- a/opam/tezos-tooling.opam +++ b/opam/tezos-tooling.opam @@ -16,7 +16,7 @@ depends: [ "base-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam index 015a2029903f..e589074ca5d8 100644 --- a/opam/tezos-tps-evaluation.opam +++ b/opam/tezos-tps-evaluation.opam @@ -26,7 +26,7 @@ depends: [ "uri" { >= "3.1.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-tree-encoding-test.opam b/opam/tezos-tree-encoding-test.opam index e17249b597d9..b99ca5ee9004 100644 --- a/opam/tezos-tree-encoding-test.opam +++ b/opam/tezos-tree-encoding-test.opam @@ -21,7 +21,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-tree-encoding.opam b/opam/tezos-tree-encoding.opam index 1aa2abadb938..1186a0a0f346 100644 --- a/opam/tezos-tree-encoding.opam +++ b/opam/tezos-tree-encoding.opam @@ -16,7 +16,7 @@ depends: [ "data-encoding" { >= "0.7.1" & < "1.0.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-validation.opam b/opam/tezos-validation.opam index 201bcc3e50ba..e17dc8fa521e 100644 --- a/opam/tezos-validation.opam +++ b/opam/tezos-validation.opam @@ -21,7 +21,7 @@ depends: [ "tezos-stdlib-unix" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-version.opam b/opam/tezos-version.opam index 0e3e8768f909..d3a5416f373b 100644 --- a/opam/tezos-version.opam +++ b/opam/tezos-version.opam @@ -17,7 +17,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-wasmer.opam b/opam/tezos-wasmer.opam index 86cbcdf84e9a..9b26d7150543 100644 --- a/opam/tezos-wasmer.opam +++ b/opam/tezos-wasmer.opam @@ -20,7 +20,7 @@ x-opam-monorepo-opam-provided: [ "tezos-rust-libs" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-webassembly-interpreter-extra.opam b/opam/tezos-webassembly-interpreter-extra.opam index 0f5bbc01b0a6..9ae6c07d75db 100644 --- a/opam/tezos-webassembly-interpreter-extra.opam +++ b/opam/tezos-webassembly-interpreter-extra.opam @@ -15,7 +15,7 @@ depends: [ "tezos-lazy-containers" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-webassembly-interpreter.opam b/opam/tezos-webassembly-interpreter.opam index 85e0d0068ab1..db72ab867180 100644 --- a/opam/tezos-webassembly-interpreter.opam +++ b/opam/tezos-webassembly-interpreter.opam @@ -20,7 +20,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezos-workers.opam b/opam/tezos-workers.opam index 77bf229a2615..8875e3874e7d 100644 --- a/opam/tezos-workers.opam +++ b/opam/tezos-workers.opam @@ -19,7 +19,7 @@ depends: [ "octez-alcotezt" {with-test} ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezt-ethereum.opam b/opam/tezt-ethereum.opam index 20380aa50c5a..131e39c0cc96 100644 --- a/opam/tezt-ethereum.opam +++ b/opam/tezt-ethereum.opam @@ -14,7 +14,7 @@ depends: [ "tezt-performance-regression" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezt-performance-regression.opam b/opam/tezt-performance-regression.opam index 52afbb5ecb5d..0493321d688b 100644 --- a/opam/tezt-performance-regression.opam +++ b/opam/tezt-performance-regression.opam @@ -15,7 +15,7 @@ depends: [ "cohttp-lwt-unix" { >= "4.0.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/tezt-tezos.opam b/opam/tezt-tezos.opam index ff74f320683e..3f6fe07f7384 100644 --- a/opam/tezt-tezos.opam +++ b/opam/tezt-tezos.opam @@ -19,7 +19,7 @@ depends: [ "cohttp-lwt-unix" { >= "4.0.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] -- GitLab