From 5c999a3f974aa83a45edd8a3afe92ea8dead5d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sat, 7 Sep 2019 13:24:30 +0200 Subject: [PATCH 1/7] CI docker WIP --- docker/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 17a80641a..61c13aada 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -30,7 +30,11 @@ RUN opam update # Install ligo RUN sh scripts/install_vendors_deps.sh -RUN sh scripts/install_ligo_with_dependencies.sh +RUN sh -c pwd +RUN sh scripts/build_ligo_local.sh +RUN sh -c pwd +RUN ls -l +RUN ls -l * # Use the ligo binary as a default command -ENTRYPOINT [ "/home/opam/.opam/4.06/bin/ligo" ] +ENTRYPOINT [ "/ligo/_build/default/src/bins/ligo" ] From d31001fab67b5a80d9b73bb8e11db69bafdf26c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sat, 7 Sep 2019 13:30:46 +0200 Subject: [PATCH 2/7] CI docker WIP --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b5a86e70..6f6cd901f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,14 +111,14 @@ remote-repo-job: # TODO: uncomment this -# # Run a docker build without publishing to the registry -# build-current-docker-image: -# stage: test # TODO DODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODO restore to build_docker -# <<: *docker -# <<: *docker_build -# except: -# - master -# - dev +# Run a docker build without publishing to the registry +build-current-docker-image: + stage: test # TODO DODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODODO restore to build_docker + <<: *docker + <<: *docker_build + except: + - master + - dev # When a MR/PR is merged to dev # take the previous build and publish it to Docker Hub From 41b2691f39d20416bb7dc9e4a4689b33943bf47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sat, 7 Sep 2019 14:08:35 +0200 Subject: [PATCH 3/7] CI docker WIP --- .gitlab-ci.yml | 2 +- docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f6cd901f..79651d8df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -140,4 +140,4 @@ pages: only: - master - dev - - feature/website-fixes + - refactor/new-tezos-deps-ci diff --git a/docker/Dockerfile b/docker/Dockerfile index 61c13aada..1614d8406 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -34,7 +34,7 @@ RUN sh -c pwd RUN sh scripts/build_ligo_local.sh RUN sh -c pwd RUN ls -l -RUN ls -l * +RUN sh -c 'ls -l /ligo/_build/default/src/bins/ligo || true' # Use the ligo binary as a default command ENTRYPOINT [ "/ligo/_build/default/src/bins/ligo" ] From cc1e142f255b8d8743637d34488743120136b446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sat, 7 Sep 2019 14:10:49 +0200 Subject: [PATCH 4/7] CI docker WIP --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79651d8df..ae52936a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -131,6 +131,7 @@ build-and-publish-latest-docker-image: - docker push $LIGO_REGISTRY_IMAGE:next only: - dev + - refactor/new-tezos-deps-ci # Pages are deployed from both master & dev, be careful not to override 'next' From 2918134c3b8c935d96a34cc5e9981df514cb0db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sat, 7 Sep 2019 14:21:02 +0200 Subject: [PATCH 5/7] CI docker WIP --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1614d8406..a67504209 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -34,7 +34,7 @@ RUN sh -c pwd RUN sh scripts/build_ligo_local.sh RUN sh -c pwd RUN ls -l -RUN sh -c 'ls -l /ligo/_build/default/src/bins/ligo || true' +RUN sh -c 'ls -l /ligo/_build/default/src/bin/cli.exe || true' # Use the ligo binary as a default command -ENTRYPOINT [ "/ligo/_build/default/src/bins/ligo" ] +ENTRYPOINT [ "/ligo/_build/default/src/bin/cli.exe" ] From fbcfe56df3d353740b1a64f438512f06f9190ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sat, 7 Sep 2019 14:25:32 +0200 Subject: [PATCH 6/7] CI docker WIP --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae52936a1..c86aed054 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,10 @@ stages: - opam install -y odoc # - vendors/opam-repository-tools/rewrite-local-opam-repository.sh # - opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository-local-generated/" - - opam install -y --build-test --deps-only ./src/ - - dune build -p ligo + - scripts/install_vendors_deps.sh + - scripts/build_ligo_local.sh + # - opam install -y --build-test --deps-only ./src/ + # - dune build -p ligo # TODO: also try instead from time to time: #- (cd ./src/; dune build -p ligo) From 61550c6c2f188c252c861a1995e9ff40032d78b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sat, 7 Sep 2019 14:30:24 +0200 Subject: [PATCH 7/7] CI docker WIP --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c86aed054..6ab62674f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,6 +134,7 @@ build-and-publish-latest-docker-image: only: - dev - refactor/new-tezos-deps-ci + - refactor/new-tezos-deps-cicliexe # Pages are deployed from both master & dev, be careful not to override 'next' @@ -144,3 +145,4 @@ pages: - master - dev - refactor/new-tezos-deps-ci + - refactor/new-tezos-deps-cicliexe