From fee7b2b7508b459a8651f1d1f72a5ae7355545ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sat, 20 Apr 2019 10:29:54 +0200 Subject: [PATCH 1/5] =?UTF-8?q?Wrong=20repo=20(tezos-opam-repository=20?= =?UTF-8?q?=E2=86=92=20new-tezos-opam-repository)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a5a744ab..5b3de8a2d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ before_script: - eval $(opam config env) - printf '' | opam switch create $switch ocaml-base-compiler.4.06.1 - eval $(opam config env) - - opam repository add tezos-opam-repository https://gitlab.com/gabriel.alfour/tezos-opam-repository.git + - opam repository add new-tezos-opam-repository https://gitlab.com/gabriel.alfour/new-tezos-opam-repository.git - eval $(opam config env) - opam --version - printf '' | ocaml From 6ca85e0be4c1d478a148fd4dcbbf3c2335253147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sat, 20 Apr 2019 11:09:07 +0200 Subject: [PATCH 2/5] Added missing dependencies --- .gitlab-ci.yml | 2 +- src/ligo/ligo.opam | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b3de8a2d..3b7af292b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ before_script: - echo "$PATH" - printf '' | opam init - eval $(opam config env) - - printf '' | opam switch create $switch ocaml-base-compiler.4.06.1 + - printf '' | opam switch create toto ocaml-base-compiler.4.06.1 - eval $(opam config env) - opam repository add new-tezos-opam-repository https://gitlab.com/gabriel.alfour/new-tezos-opam-repository.git - eval $(opam config env) diff --git a/src/ligo/ligo.opam b/src/ligo/ligo.opam index bf16e3e7f..09fd47695 100644 --- a/src/ligo/ligo.opam +++ b/src/ligo/ligo.opam @@ -12,6 +12,8 @@ depends: [ "menhir" "ppx_let" "tezos-utils" + "getopt" + "yojson" ] build: [ [ "dune" "build" "-p" name "-j" jobs ] From 3ef44fe5231ed2599a9281fd7d100a326c16fc1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sat, 20 Apr 2019 12:03:06 +0200 Subject: [PATCH 3/5] dummy to trigger build --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b7af292b..83f5ace48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,7 @@ default-job: paths: - src/ligo/bin/cli.ml + install-from-repo-job: script: - opam install -y ligo From a3b5a82d97a019d7442f0303a92e7aefab101efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sat, 20 Apr 2019 12:27:32 +0200 Subject: [PATCH 4/5] Debug info for CI, added synopsis for ligo.opam --- .gitlab-ci.yml | 2 ++ src/ligo/ligo.opam | 1 + 2 files changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83f5ace48..5777fd100 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,8 +12,10 @@ before_script: - eval $(opam config env) - opam repository add new-tezos-opam-repository https://gitlab.com/gabriel.alfour/new-tezos-opam-repository.git - eval $(opam config env) + # Show versions and current switch - opam --version - printf '' | ocaml + - opam switch default-job: script: diff --git a/src/ligo/ligo.opam b/src/ligo/ligo.opam index 09fd47695..b57c739bf 100644 --- a/src/ligo/ligo.opam +++ b/src/ligo/ligo.opam @@ -4,6 +4,7 @@ maintainer: "gabriel.alfour@gmail.com" authors: [ "Galfour" ] homepage: "https://gitlab.com/gabriel.alfour/tezos" bug-reports: "https://gitlab.com/gabriel.alfour/tezos/issues" +synopsis: "A higher-level language which compiles to Michelson" dev-repo: "git+https://gitlab.com/gabriel.alfour/tezos.git" license: "MIT" depends: [ From 741742e48beb415900c831f43df7adc10f003dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sat, 20 Apr 2019 12:31:56 +0200 Subject: [PATCH 5/5] Debug for CI --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5777fd100..bb790d8bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,9 +19,9 @@ before_script: default-job: script: - - (cd src/lib_utils && opam install -y --working-dir .) - - (cd src/ligo && opam install -y --working-dir .) - - (cd src/ligo && dune build && dune build -p ligo && dune build @ligo-test) + - (cd src/lib_utils && ls -a && opam install -y --working-dir .) + - (cd src/ligo && ls -a && opam install -y --working-dir .) + - (cd src/ligo && ls -a && dune build && dune build -p ligo && dune build @ligo-test) artifacts: paths: - src/ligo/bin/cli.ml