From 4dc231956f1bc29fe700223cb8801e753b98b722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Tue, 23 Apr 2019 13:59:10 +0200 Subject: [PATCH 1/5] Missing build-time dependency: rsync --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb790d8bc..fe984eaa2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ before_script: - apt-get update -qq - - apt-get -y -qq install libhidapi-dev libcap-dev libev-dev bubblewrap + # rsync is needed by opam to sync a package installed from a local directory with the copy in ~/.opam + - apt-get -y -qq install rsync libhidapi-dev libcap-dev libev-dev bubblewrap - wget https://github.com/ocaml/opam/releases/download/2.0.1/opam-2.0.1-x86_64-linux -O opam-2.0.1-x86_64-linux - cp opam-2.0.1-x86_64-linux /usr/local/bin/opam - chmod +x /usr/local/bin/opam From ff4804269f2b30b033f1f8007b14d04be7a6c1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Tue, 23 Apr 2019 14:28:06 +0200 Subject: [PATCH 2/5] Missing dependency: alcotest --- src/ligo/ligo.opam | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ligo/ligo.opam b/src/ligo/ligo.opam index b57c739bf..963bc0338 100644 --- a/src/ligo/ligo.opam +++ b/src/ligo/ligo.opam @@ -1,3 +1,4 @@ +name: "ligo" opam-version: "2.0" version: "1.0" maintainer: "gabriel.alfour@gmail.com" @@ -15,9 +16,11 @@ depends: [ "tezos-utils" "getopt" "yojson" + "alcotest" { test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ] + # needed in the repository, but must not be present in the local ligo.opam [ "mv" "src/ligo/ligo.install" "." ] ] url { From b57a06de8ad6e05177c7dfbd68ff337abd78bddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Tue, 23 Apr 2019 14:43:36 +0200 Subject: [PATCH 3/5] Removed dependency on getopt. Explicitly list modules in pascaligo, excluded the Mains and LexerLog --- src/ligo/ligo.opam | 1 - src/ligo/parser/pascaligo/dune | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/ligo/ligo.opam b/src/ligo/ligo.opam index 963bc0338..b9ba9a104 100644 --- a/src/ligo/ligo.opam +++ b/src/ligo/ligo.opam @@ -14,7 +14,6 @@ depends: [ "menhir" "ppx_let" "tezos-utils" - "getopt" "yojson" "alcotest" { test } ] diff --git a/src/ligo/parser/pascaligo/dune b/src/ligo/parser/pascaligo/dune index f256b66d8..0e8044728 100644 --- a/src/ligo/parser/pascaligo/dune +++ b/src/ligo/parser/pascaligo/dune @@ -9,9 +9,9 @@ (library (name parser_pascaligo) (public_name ligo.parser.pascaligo) + (modules AST FQueue Markup pascaligo Utils Version Lexer Error Parser ParserLog LexToken) (modules_without_implementation Error) (libraries - getopt hex str uutf @@ -23,17 +23,17 @@ ;; Les deux directives (rule) qui suivent sont pour le dev local. ;; Il suffit de faire "dune build Parser.exe" pour avoir un Parser.exe dans le dossier. ;; Pour le purger, il faut faire "dune clean". -(rule - (targets Parser.exe) - (deps ParserMain.exe) - (action (copy ParserMain.exe Parser.exe)) - (mode promote-until-clean)) +;(rule +; (targets Parser.exe) +; (deps ParserMain.exe) +; (action (copy ParserMain.exe Parser.exe)) +; (mode promote-until-clean)) -(rule - (targets Lexer.exe) - (deps LexerMain.exe) - (action (copy LexerMain.exe Lexer.exe)) - (mode promote-until-clean)) +;(rule +; (targets Lexer.exe) +; (deps LexerMain.exe) +; (action (copy LexerMain.exe Lexer.exe)) +; (mode promote-until-clean)) (rule (targets Version.ml) From 6d9334a60dcd3c338f34a485470d77ab2b3e9380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Tue, 23 Apr 2019 15:28:02 +0200 Subject: [PATCH 4/5] opam install --build-test to install the test-only dependencies --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe984eaa2..de00490bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,8 +20,8 @@ before_script: default-job: script: - - (cd src/lib_utils && ls -a && opam install -y --working-dir .) - - (cd src/ligo && ls -a && opam install -y --working-dir .) + - (cd src/lib_utils && ls -a && opam install -y --build-test --working-dir .) + - (cd src/ligo && ls -a && opam install -y --build-test --working-dir .) - (cd src/ligo && ls -a && dune build && dune build -p ligo && dune build @ligo-test) artifacts: paths: From eb20191704839720417309217ade92d566385ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Tue, 23 Apr 2019 16:26:09 +0200 Subject: [PATCH 5/5] Conditional for tests is 'with-test', not 'test'. --- .gitlab-ci.yml | 11 ++++++++--- src/ligo/ligo.opam | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de00490bb..e005feae6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,9 +20,9 @@ before_script: default-job: script: - - (cd src/lib_utils && ls -a && opam install -y --build-test --working-dir .) - - (cd src/ligo && ls -a && opam install -y --build-test --working-dir .) - - (cd src/ligo && ls -a && dune build && dune build -p ligo && dune build @ligo-test) + - (cd src/lib_utils && opam install -y --build-test --working-dir .) + - (cd src/ligo && opam install -y --build-test --working-dir .) + - (cd src/ligo && dune build && dune build -p ligo && dune build @ligo-test) artifacts: paths: - src/ligo/bin/cli.ml @@ -31,3 +31,8 @@ default-job: install-from-repo-job: script: - opam install -y ligo + # Used in the IDE + #- opam install -y user-setup + #- opam install -y merlin + #- opam install -y ocp-indent + #- opam user-setup install diff --git a/src/ligo/ligo.opam b/src/ligo/ligo.opam index b9ba9a104..1797dad77 100644 --- a/src/ligo/ligo.opam +++ b/src/ligo/ligo.opam @@ -15,7 +15,7 @@ depends: [ "ppx_let" "tezos-utils" "yojson" - "alcotest" { test } + "alcotest" { with-test } ] build: [ [ "dune" "build" "-p" name "-j" jobs ]