From e91483360042e37c309d7d2a07e45ee182311d23 Mon Sep 17 00:00:00 2001 From: Tom Jack Date: Sat, 7 Dec 2019 08:11:33 -0600 Subject: [PATCH 1/2] Add --version via dune rule --- src/bin/cli.ml | 9 ++++++++- src/bin/dune | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/bin/cli.ml b/src/bin/cli.ml index a9376ca9d..13cb7f761 100644 --- a/src/bin/cli.ml +++ b/src/bin/cli.ml @@ -2,11 +2,18 @@ open Cmdliner open Trace open Cli_helpers +let version = + Format.asprintf + "Rolling release\nHash: %s\nDate: %s\nCI job id: %s" + Version.hash + Version.commit_date + Version.job_id + let main = let man = [ `S "MORE HELP"; `P "Use `$(mname) $(i,COMMAND) --help' for help on a single command." ] in - (Term.(ret (const (`Help (`Auto, None)))), Term.info "ligo" ~man) + (Term.(ret (const (`Help (`Auto, None)))), Term.info "ligo" ~version ~man) let source_file n = let open Arg in diff --git a/src/bin/dune b/src/bin/dune index 5a2c5efd3..4546f2a6f 100644 --- a/src/bin/dune +++ b/src/bin/dune @@ -5,13 +5,20 @@ cmdliner ligo ) - (modules cli cli_helpers) + (modules cli cli_helpers version) (preprocess (pps ppx_let) ) (flags (:standard -open Simple_utils)) ) +(rule + (targets version.ml) + (action (with-stdout-to + version.ml + (run "sh" "-c" + "printf 'let hash = \"%s\"\nlet commit_date = \"%s\"\nlet job_id = \"%s\"\n' \"$(git rev-parse HEAD)\" \"$(git show --no-patch --format=%ci)\" \"${CI_JOB_ID}\"")))) + (executable (name runligo) (public_name ligo) From 611bd0382ab8924f69e9cfd9acdd43567a077198 Mon Sep 17 00:00:00 2001 From: Tom Jack Date: Fri, 13 Dec 2019 03:11:18 -0600 Subject: [PATCH 2/2] dune runtest ; dune promote --- src/bin/expect_tests/help_tests.ml | 45 ++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/src/bin/expect_tests/help_tests.ml b/src/bin/expect_tests/help_tests.ml index 769df1144..9c8efcb6a 100644 --- a/src/bin/expect_tests/help_tests.ml +++ b/src/bin/expect_tests/help_tests.ml @@ -51,7 +51,10 @@ let%expect_test _ = --help[=FMT] (default=auto) Show this help in format FMT. The value FMT must be one of `auto', `pager', `groff' or `plain'. With `auto', the format is `pager` or - `plain' whenever the TERM env var is `dumb' or undefined. |} ] ; + `plain' whenever the TERM env var is `dumb' or undefined. + + --version + Show version information. |} ] ; run_ligo_good [ "--help" ] ; [%expect {| @@ -102,7 +105,10 @@ let%expect_test _ = --help[=FMT] (default=auto) Show this help in format FMT. The value FMT must be one of `auto', `pager', `groff' or `plain'. With `auto', the format is `pager` or - `plain' whenever the TERM env var is `dumb' or undefined. |} ] ; + `plain' whenever the TERM env var is `dumb' or undefined. + + --version + Show version information. |} ] ; run_ligo_good [ "compile-contract" ; "--help" ] ; [%expect {| @@ -142,7 +148,10 @@ let%expect_test _ = -s SYNTAX, --syntax=SYNTAX (absent=auto) SYNTAX is the syntax that will be used. Currently supported syntaxes are "pascaligo" and "cameligo". By default, the syntax is - guessed from the extension (.ligo and .mligo, respectively). |} ] ; + guessed from the extension (.ligo and .mligo, respectively). + + --version + Show version information. |} ] ; run_ligo_good [ "compile-parameter" ; "--help" ] ; [%expect {| @@ -188,7 +197,10 @@ let%expect_test _ = -s SYNTAX, --syntax=SYNTAX (absent=auto) SYNTAX is the syntax that will be used. Currently supported syntaxes are "pascaligo" and "cameligo". By default, the syntax is - guessed from the extension (.ligo and .mligo, respectively). |} ] ; + guessed from the extension (.ligo and .mligo, respectively). + + --version + Show version information. |} ] ; run_ligo_good [ "compile-storage" ; "--help" ] ; [%expect {| @@ -235,7 +247,10 @@ let%expect_test _ = -s SYNTAX, --syntax=SYNTAX (absent=auto) SYNTAX is the syntax that will be used. Currently supported syntaxes are "pascaligo" and "cameligo". By default, the syntax is - guessed from the extension (.ligo and .mligo, respectively). |} ] ; + guessed from the extension (.ligo and .mligo, respectively). + + --version + Show version information. |} ] ; run_ligo_good [ "dry-run" ; "--help" ] ; [%expect {| @@ -287,7 +302,10 @@ let%expect_test _ = SENDER is the sender the dry-run transaction will use. --source=SOURCE - SOURCE is the source the dry-run transaction will use. |} ] ; + SOURCE is the source the dry-run transaction will use. + + --version + Show version information. |} ] ; run_ligo_good [ "run-function" ; "--help" ] ; [%expect {| @@ -336,7 +354,10 @@ let%expect_test _ = SENDER is the sender the dry-run transaction will use. --source=SOURCE - SOURCE is the source the dry-run transaction will use. |} ] ; + SOURCE is the source the dry-run transaction will use. + + --version + Show version information. |} ] ; run_ligo_good [ "evaluate-value" ; "--help" ] ; [%expect {| @@ -380,7 +401,10 @@ let%expect_test _ = SENDER is the sender the dry-run transaction will use. --source=SOURCE - SOURCE is the source the dry-run transaction will use. |} ] ; + SOURCE is the source the dry-run transaction will use. + + --version + Show version information. |} ] ; run_ligo_good [ "compile-expression" ; "--help" ] ; [%expect {| @@ -416,4 +440,7 @@ let%expect_test _ = --michelson-format=MICHELSON_FORMAT (absent=text) MICHELSON_FORMAT is the format that will be used by compile-contract for the resulting Michelson. Available formats - are 'text' (default), 'json' and 'hex'. |} ] ; + are 'text' (default), 'json' and 'hex'. + + --version + Show version information. |} ] ;