Commit 87e0de98 authored by Grégoire Henry's avatar Grégoire Henry

Dune: use the new syntax

parent 5362b321
Pipeline #27031311 failed with stages
in 26 minutes and 51 seconds
......@@ -31,6 +31,8 @@ docs/api/p2p.rst
src/bin_client/test/LOG.*
**/dune-project
**/*.install
**/.merlin
......
......@@ -31,6 +31,7 @@ __pycache__
/src/bin_client/test/LOG.*
dune-project
*.install
.merlin
......
(jbuild_version 1)
(executables
((names (rpc_doc
p2p_doc))
(libraries
(tezos-base
tezos-stdlib-unix
tezos-shell
tezos-protocol-updater
tezos-embedded-protocol-alpha
re))
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
-open Tezos_stdlib_unix
-open Tezos_shell
-open Tezos_protocol_updater
-linkall))
))
(names rpc_doc
p2p_doc)
(libraries tezos-base
tezos-stdlib-unix
tezos-shell
tezos-protocol-updater
tezos-embedded-protocol-alpha
re)
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
-open Tezos_stdlib_unix
-open Tezos_shell
-open Tezos_protocol_updater
-linkall)))
(alias
((name buildtest)
(deps (rpc_doc.exe
p2p_doc.exe))))
(name buildtest)
(deps rpc_doc.exe
p2p_doc.exe))
(alias
((name runtest_indent)
(deps ((glob_files *.ml{,i})))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
(name runtest_indent)
(deps (glob_files *.ml{,i}))
(action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))
(jbuild_version 1)
(executable
((name error_doc)
(libraries
(tezos-shell
tezos-client-alpha))
(flags (:standard -w -9+27-30-32-40@8
-open Tezos_base
-open Tezos_error_monad
-open Tezos_data_encoding
-open Tezos_client_alpha
-safe-string
-linkall))))
(name error_doc)
(libraries tezos-shell
tezos-client-alpha)
(flags (:standard -w -9+27-30-32-40@8
-open Tezos_base
-open Tezos_error_monad
-open Tezos_data_encoding
-open Tezos_client_alpha
-safe-string
-linkall)))
(alias
((name runtest_indent)
(deps ((glob_files *.ml{,i})))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
(name runtest_indent)
(deps (glob_files *.ml{,i}))
(action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))
(jbuild_version 1)
(env
(dev
(flags (:standard)))
(release
(flags (:standard -O3))))
(alias
((name runtest)
(deps ((alias_rec runtest_indent)))))
(name runtest)
(deps (alias_rec runtest_indent)))
(alias
((name runtest)
(deps ((alias_rec runtest_sandbox)))))
(name runtest)
(deps (alias_rec runtest_sandbox)))
(lang dune 1.0)
(jbuild_version 1)
(executables
((names (main_client main_admin))
(public_names (tezos-client tezos-admin-client))
(libraries (tezos-base
tezos-rpc-http
tezos-shell-services
tezos-client-base
tezos-client-commands
tezos-client-genesis
tezos-client-alpha
tezos-stdlib-unix
tezos-client-base-unix
tezos-client-alpha-commands.registration
tezos-baking-alpha-commands.registration
tezos-signer-backends))
(names main_client main_admin)
(public_names tezos-client tezos-admin-client)
(libraries tezos-base
tezos-rpc-http
tezos-shell-services
tezos-client-base
tezos-client-commands
tezos-client-genesis
tezos-client-alpha
tezos-stdlib-unix
tezos-client-base-unix
tezos-client-alpha-commands.registration
tezos-baking-alpha-commands.registration
tezos-signer-backends)
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
......@@ -23,13 +21,13 @@
-open Tezos_shell_services
-open Tezos_client_base
-open Tezos_client_commands
-open Tezos_client_base_unix))))
-open Tezos_client_base_unix)))
(install
((section bin)
(files ((tezos-init-sandboxed-client.sh as tezos-init-sandboxed-client.sh)))))
(section bin)
(files (tezos-init-sandboxed-client.sh as tezos-init-sandboxed-client.sh)))
(alias
((name runtest_indent)
(deps ((glob_files *.ml{,i})))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
(name runtest_indent)
(deps (glob_files *.ml{,i}))
(action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))
(jbuild_version 1)
(alias
((name runtest_basic.sh)
(deps (sandbox.json
protocol_parameters.json
king_commitment.json
queen_commitment.json
test_lib.inc.sh
(glob_files contracts/*)
))
(locks (/tcp-port/18731
/tcp-port/19731))
(action (run bash ${path:test_basic.sh}
${bin:tezos-sandboxed-node.sh}
${bin:tezos-node}
${bin:tezos-init-sandboxed-client.sh}
${bin:tezos-client}
${bin:tezos-admin-client}
))))
(name runtest_basic.sh)
(deps sandbox.json
protocol_parameters.json
king_commitment.json
queen_commitment.json
test_lib.inc.sh
(glob_files contracts/*))
(locks /tcp-port/18731
/tcp-port/19731)
(action
(run bash %{dep:test_basic.sh}
%{bin:tezos-sandboxed-node.sh}
%{bin:tezos-node}
%{bin:tezos-init-sandboxed-client.sh}
%{bin:tezos-client}
%{bin:tezos-admin-client})))
(alias
((name runtest_contracts.sh)
(deps (sandbox.json
test_lib.inc.sh
(glob_files contracts/*)
))
(locks (/tcp-port/18731
/tcp-port/19731))
(action (run bash ${path:test_contracts.sh}
${bin:tezos-sandboxed-node.sh}
${bin:tezos-node}
${bin:tezos-init-sandboxed-client.sh}
${bin:tezos-client}
${bin:tezos-admin-client}
))))
(name runtest_contracts.sh)
(deps sandbox.json
test_lib.inc.sh
(glob_files contracts/*))
(locks /tcp-port/18731
/tcp-port/19731)
(action
(run bash %{dep:test_contracts.sh}
%{bin:tezos-sandboxed-node.sh}
%{bin:tezos-node}
%{bin:tezos-init-sandboxed-client.sh}
%{bin:tezos-client}
%{bin:tezos-admin-client})))
(alias
((name runtest_multinode.sh)
(deps (sandbox.json
test_lib.inc.sh
(glob_files contracts/*.tz)
))
(locks (/tcp-port/18731 /tcp-port/18732 /tcp-port/18733 /tcp-port/18734
/tcp-port/18735 /tcp-port/18736 /tcp-port/18737 /tcp-port/18738
/tcp-port/19731 /tcp-port/19732 /tcp-port/19733 /tcp-port/19734
/tcp-port/19735 /tcp-port/19736 /tcp-port/19737 /tcp-port/19738))
(action (run bash ${path:test_multinode.sh}
${bin:tezos-sandboxed-node.sh}
${bin:tezos-node}
${bin:tezos-init-sandboxed-client.sh}
${bin:tezos-client}
${bin:tezos-admin-client}
))))
(name runtest_multinode.sh)
(deps sandbox.json
test_lib.inc.sh
(glob_files contracts/*.tz))
(locks /tcp-port/18731 /tcp-port/18732 /tcp-port/18733 /tcp-port/18734
/tcp-port/18735 /tcp-port/18736 /tcp-port/18737 /tcp-port/18738
/tcp-port/19731 /tcp-port/19732 /tcp-port/19733 /tcp-port/19734
/tcp-port/19735 /tcp-port/19736 /tcp-port/19737 /tcp-port/19738)
(action
(run bash %{dep:test_multinode.sh}
%{bin:tezos-sandboxed-node.sh}
%{bin:tezos-node}
%{bin:tezos-init-sandboxed-client.sh}
%{bin:tezos-client}
%{bin:tezos-admin-client})))
(alias
((name runtest_injection.sh)
(locks (/tcp-port/18731
/tcp-port/19731))
(deps (sandbox.json
protocol_parameters.json
test_lib.inc.sh
(glob_files demo/*)
))
(action (run bash ${path:test_injection.sh}
${bin:tezos-sandboxed-node.sh}
${bin:tezos-node}
${bin:tezos-init-sandboxed-client.sh}
${bin:tezos-client}
${bin:tezos-admin-client}
${bin:tezos-protocol-compiler}
))))
(name runtest_injection.sh)
(locks /tcp-port/18731
/tcp-port/19731)
(deps sandbox.json
protocol_parameters.json
test_lib.inc.sh
(glob_files demo/*))
(action
(run bash %{dep:test_injection.sh}
%{bin:tezos-sandboxed-node.sh}
%{bin:tezos-node}
%{bin:tezos-init-sandboxed-client.sh}
%{bin:tezos-client}
%{bin:tezos-admin-client}
%{bin:tezos-protocol-compiler})))
(alias
((name runtest_tls.sh)
(locks (/tcp-port/18731
/tcp-port/19731))
(deps (sandbox.json
test_lib.inc.sh
(glob_files demo/*)
))
(action
(setenv USE_TLS true (run bash ${path:test_tls.sh}
${bin:tezos-sandboxed-node.sh}
${bin:tezos-node}
${bin:tezos-init-sandboxed-client.sh}
${bin:tezos-client}
${bin:tezos-admin-client}
)))))
(name runtest_tls.sh)
(locks /tcp-port/18731
/tcp-port/19731)
(deps sandbox.json
test_lib.inc.sh
(glob_files demo/*))
(action
(run bash %{dep:test_tls.sh}
%{bin:tezos-sandboxed-node.sh}
%{bin:tezos-node}
%{bin:tezos-init-sandboxed-client.sh}
%{bin:tezos-client}
%{bin:tezos-admin-client})))
(alias
((name runtest_cors.sh)
(locks (/tcp-port/18731
/tcp-port/19731))
(deps (sandbox.json
test_lib.inc.sh
(glob_files demo/*)
))
(action (run bash ${path:test_cors.sh}
${bin:tezos-sandboxed-node.sh}
${bin:tezos-node}
${bin:tezos-init-sandboxed-client.sh}
${bin:tezos-client}
${bin:tezos-admin-client}
))))
(name runtest_cors.sh)
(locks /tcp-port/18731
/tcp-port/19731)
(deps sandbox.json
test_lib.inc.sh
(glob_files demo/*))
(action
(run bash %{dep:test_cors.sh}
%{bin:tezos-sandboxed-node.sh}
%{bin:tezos-node}
%{bin:tezos-init-sandboxed-client.sh}
%{bin:tezos-client}
%{bin:tezos-admin-client})))
(alias
((name runtest)
(deps ((alias runtest_basic.sh)
(alias runtest_contracts.sh)
(alias runtest_multinode.sh)
(alias runtest_injection.sh)
(alias runtest_tls.sh)
(alias runtest_cors.sh)))))
(name runtest)
(deps (alias runtest_basic.sh)
(alias runtest_contracts.sh)
(alias runtest_multinode.sh)
(alias runtest_injection.sh)
(alias runtest_tls.sh)
(alias runtest_cors.sh)))
......@@ -4,6 +4,8 @@
set -e
export USE_TLS=true
test_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)")"
source $test_dir/test_lib.inc.sh "$@"
......
(jbuild_version 1)
(executable
((name main)
(public_name tezos-node)
(libraries (tezos-base
tezos-stdlib-unix
tezos-shell-services
tezos-rpc-http
tezos-p2p
tezos-shell
tezos-protocol-updater
tezos-embedded-protocol-genesis
tezos-embedded-protocol-demo
tezos-embedded-protocol-alpha
cmdliner
tls))
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
-open Tezos_stdlib_unix
-open Tezos_shell_services
-open Tezos_rpc_http
-open Tezos_p2p
-open Tezos_shell
-open Tezos_protocol_updater
-linkall))))
(name main)
(public_name tezos-node)
(libraries tezos-base
tezos-stdlib-unix
tezos-shell-services
tezos-rpc-http
tezos-p2p
tezos-shell
tezos-protocol-updater
tezos-embedded-protocol-genesis
tezos-embedded-protocol-demo
tezos-embedded-protocol-alpha
cmdliner
tls)
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
-open Tezos_stdlib_unix
-open Tezos_shell_services
-open Tezos_rpc_http
-open Tezos_p2p
-open Tezos_shell
-open Tezos_protocol_updater
-linkall)))
(install
((section bin)
(files ((tezos-sandboxed-node.sh as tezos-sandboxed-node.sh)))))
(section bin)
(files (tezos-sandboxed-node.sh as tezos-sandboxed-node.sh)))
(alias
((name runtest_indent)
(deps ((glob_files *.ml{,i})))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
(name runtest_indent)
(deps (glob_files *.ml{,i}))
(action
(run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))
(jbuild_version 1)
(executables
((names (main_signer))
(public_names (tezos-signer))
(libraries (tezos-base
tezos-client-base
tezos-client-base-unix
tezos-client-commands
tezos-signer-services
tezos-rpc-http
tezos-stdlib-unix
tezos-signer-backends))
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
-open Tezos_client_base
-open Tezos_client_base_unix
-open Tezos_client_commands
-open Tezos_signer_services
-open Tezos_rpc_http
-open Tezos_stdlib_unix))))
(names main_signer)
(public_names tezos-signer)
(libraries tezos-base
tezos-client-base
tezos-client-base-unix
tezos-client-commands
tezos-signer-services
tezos-rpc-http
tezos-stdlib-unix
tezos-signer-backends)
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
-open Tezos_client_base
-open Tezos_client_base_unix
-open Tezos_client_commands
-open Tezos_signer_services
-open Tezos_rpc_http
-open Tezos_stdlib_unix)))
(alias
((name runtest_indent)
(deps ((glob_files *.ml{,i})))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
(name runtest_indent)
(deps (glob_files *.ml{,i}))
(action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))
(jbuild_version 1)
(library
((name tezos_base)
(public_name tezos-base)
(flags (:standard -w -30
-open Tezos_stdlib
-open Tezos_crypto
-open Tezos_data_encoding
-open Tezos_error_monad
-open Tezos_rpc
-open Tezos_clic
-open Tezos_micheline
-safe-string))
(libraries (tezos-stdlib
tezos-crypto
tezos-data-encoding
tezos-error-monad
tezos-rpc
tezos-clic
tezos-micheline
re.str
calendar
ezjsonm
lwt.unix
mtime.clock.os
ipaddr.unix))))
(name tezos_base)
(public_name tezos-base)
(flags (:standard -w -30
-open Tezos_stdlib
-open Tezos_crypto
-open Tezos_data_encoding
-open Tezos_error_monad
-open Tezos_rpc
-open Tezos_clic
-open Tezos_micheline
-safe-string))
(libraries tezos-stdlib
tezos-crypto
tezos-data-encoding
tezos-error-monad
tezos-rpc
tezos-clic
tezos-micheline
re.str
calendar
ezjsonm
lwt.unix
mtime.clock.os
ipaddr.unix))
(alias
((name runtest_indent)
(deps ((glob_files *.ml{,i})))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
(name runtest_indent)
(deps (glob_files *.ml{,i}))
(action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))
(jbuild_version 1)
(library
((name tezos_clic)
(public_name tezos-clic)
(flags (:standard -w -30
-safe-string
-open Tezos_stdlib
-open Tezos_error_monad))
(libraries (tezos-stdlib
tezos-error-monad))))
(name tezos_clic)
(public_name tezos-clic)
(flags (:standard -w -30
-safe-string
-open Tezos_stdlib
-open Tezos_error_monad))
(libraries tezos-stdlib
tezos-error-monad))
(alias
((name runtest_indent)
(deps ((glob_files *.ml{,i})))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
(name runtest_indent)
(deps (glob_files *.ml{,i}))
(action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))
(jbuild_version 1)
(library
((name tezos_client_base)
(public_name tezos-client-base)
(libraries (tezos-base
tezos-shell-services
tezos-rpc))
(library_flags (:standard -linkall))
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
-open Tezos_rpc
-open Tezos_shell_services))))
(name tezos_client_base)
(public_name tezos-client-base)
(libraries tezos-base
tezos-shell-services
tezos-rpc)
(library_flags (:standard -linkall))
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
-open Tezos_rpc
-open Tezos_shell_services)))
(alias
((name runtest_indent)
(deps ((glob_files *.ml{,i})))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
(name runtest_indent)
(deps (glob_files *.ml{,i}))
(action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))
(jbuild_version 1)
(library
((name tezos_client_base_unix)
(public_name tezos-client-base-unix)
(libraries (tezos-base
tezos-client-base
tezos-client-commands
tezos-stdlib-unix
tezos-rpc-http
tezos-signer-backends
tezos-shell-services))
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
-open Tezos_rpc_http
-open Tezos_shell_services
-open Tezos_stdlib_unix
-open Tezos_client_base
-open Tezos_client_commands
-linkall))))
(name tezos_client_base_unix)
(public_name tezos-client-base-unix)
(libraries tezos-base
tezos-client-base
tezos-client-commands
tezos-stdlib-unix
tezos-rpc-http
tezos-signer-backends
tezos-shell-services)
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
-open Tezos_rpc_http
-open Tezos_shell_services
-open Tezos_stdlib_unix
-open Tezos_client_base
-open Tezos_client_commands
-linkall)))
(alias
((name runtest_indent)
(deps ((glob_files *.ml{,i})))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
(name runtest_indent)
(deps (glob_files *.ml{,i}))
(action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))
(jbuild_version 1)
(library
((name tezos_client_commands)
(public_name tezos-client-commands)
(libraries (tezos-base
tezos-client-base
tezos-rpc
tezos-shell-services
tezos-signer-backends))
(library_flags (:standard -linkall))
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
-open Tezos_rpc
-open Tezos_client_base
-open Tezos_shell_services))))
(name tezos_client_commands)
(public_name tezos-client-commands)
(libraries tezos-base
tezos-client-base
tezos-rpc
tezos-shell-services
tezos-signer-backends)
(library_flags (:standard -linkall))
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives
-open Tezos_rpc
-open Tezos_client_base
-open Tezos_shell_services)))
(alias
((name runtest_indent)
(deps ((glob_files *.ml{,i})))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))
(name runtest_indent)
(deps (glob_files *.ml{,i}))
(action (run bash %{libexec:tezos-stdlib:test-ocp-indent.sh} %{deps})))