From 91f31f2914a6bb754720a26d6f03f46389da515d Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Thu, 21 May 2020 18:56:44 +0300 Subject: [PATCH 1/8] Update install documentation to reflect packaging updates --- gitlab-pages/docs/intro/installation.md | 29 +++++++++++++++++-------- nix/ligo-website.nix | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/gitlab-pages/docs/intro/installation.md b/gitlab-pages/docs/intro/installation.md index 87abfdfe5..111c1c50a 100644 --- a/gitlab-pages/docs/intro/installation.md +++ b/gitlab-pages/docs/intro/installation.md @@ -40,20 +40,31 @@ curl https://gitlab.com/ligolang/ligo/raw/master/scripts/installer.sh | bash -s ligo --help ``` +## Static Linux binary + +We have built ligo executable statically. It should run on most modern Linux distributions. + +To use it, get it [here](/bin/linux/ligo), make it executable, you're done! + +```zsh +wget https://ligolang.org/bin/linux/ligo +chmod +x ./ligo +``` + +Optionally, you can put it somewhere in your `PATH` for easy access: + +```zsh +sudo cp ./ligo /usr/local/bin +``` ## Debian Linux package installation -We have produced .deb packages for a few Debian Linux versions. They will install a global `ligo` executable. -First download one of the packages below, and then install using: +We have produced .deb package with the static executable of ligo. +First download [the package](/deb/ligo.deb), and then install using: +```zsh +sudo apt install ./ligo.deb ``` -sudo apt install ./.deb -``` - -- [Ubuntu 18.04](/deb/ligo_ubuntu-18.04.deb) -- [Ubuntu 19.10](/deb/ligo_ubuntu-19.10.deb) -- [Debian 9](/deb/ligo_debian-9.deb) -- [Debian 10](/deb/ligo_debian-10.deb) ## Release schedule diff --git a/nix/ligo-website.nix b/nix/ligo-website.nix index 5e95e7b8c..336434e33 100644 --- a/nix/ligo-website.nix +++ b/nix/ligo-website.nix @@ -9,7 +9,7 @@ buildNpmPackage { ''; installPhase = '' cp -Lr build $out - cp -r ${ligo-deb}/* $out/deb + cp -r ${ligo-deb}/*.deb $out/deb/ligo.deb mkdir -p $out/bin/linux cp -r ${ligo-static}/bin/ligo $out/bin/linux/ligo cp -r ${ligo-doc}/share/doc $out/odoc From b522e50ce280c81fa9ef52f40128b494cca5a4e7 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Thu, 21 May 2020 19:03:15 +0300 Subject: [PATCH 2/8] Fix webide deploy handoff --- .gitlab-ci.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eee6f2105..b7260799f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ variables: stages: - build - push + - ide-deploy - versioning .docker-image: @@ -121,7 +122,6 @@ webide-docker: paths: - webide.tar.gz - webide-push: extends: .docker-image dependencies: @@ -138,6 +138,17 @@ webide-push: - docker tag ligo-editor "${WEBIDE_IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}" - docker push "${WEBIDE_IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}" +deploy-handoff: + # Handoff deployment duties to private repo + stage: ide-deploy + variables: + IDE_DOCKER_IMAGE: "registry.gitlab.com/${CI_PROJECT_PATH}/ligo_webide" + LIGO_COMMIT_REF_NAME: "${CI_COMMIT_SHORT_SHA}" + trigger: ligolang/ligo-webide-deploy + rules: + - if: '$CI_COMMIT_REF_NAME == "dev"' + when: always + static-binary: extends: .nix only: From a14bf15e77581df71cc5ac53e2cfcdeac03883ab Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Thu, 21 May 2020 19:13:11 +0300 Subject: [PATCH 3/8] Run webide e2e tests --- .gitlab-ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7260799f..be16f2a95 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,15 +67,8 @@ test: paths: - coverage -# FIXME For some reason, e2e tests can't build on CI. -.webide-e2e: +webide-e2e: extends: .nix - rules: - - changes: - - tools/webide/** - when: always - - if: '$CI_COMMIT_REF_NAME =~ /^(dev|.*-run-dev)$/ && $CI_PROJECT_PATH == "ligolang/ligo"' - when: always script: - nix-build nix -A ligo-editor.e2e From 3d78114b251e0ce43ebf3ab32bcf2ffbdbbae05d Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Thu, 21 May 2020 19:14:41 +0300 Subject: [PATCH 4/8] Pass COMMIT_DATE to the build --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be16f2a95..94693fcc0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,7 @@ version_scheduled_job: before_script: - find "$CI_PROJECT_DIR" -path "$CI_PROJECT_DIR/.git" -prune -o "(" -type d -a -not -perm -u=w ")" -exec chmod --verbose u+w {} ";" - nix-env -f channel:nixos-unstable -iA gnutar gitMinimal + - export COMMIT_DATE="$(git show --no-patch --format=%ci)" # The binary produced is useless by itself binary: From b5d1cd6b5bb33036f1cbdce118186eacfb42cf8b Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Thu, 21 May 2020 19:31:48 +0300 Subject: [PATCH 5/8] Run webide e2e tests on merge requests --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94693fcc0..8681301a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,6 +70,10 @@ test: webide-e2e: extends: .nix + only: + - merge_requests + - dev + - /^.*-run-dev$/ script: - nix-build nix -A ligo-editor.e2e From ecebfb37ccfff75d95e1cfc7a8f0d7c15cc9c0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Suzanne=20Dup=C3=A9ron?= Date: Fri, 22 May 2020 18:33:18 +0000 Subject: [PATCH 6/8] Update installation.md (grammar) --- gitlab-pages/docs/intro/installation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-pages/docs/intro/installation.md b/gitlab-pages/docs/intro/installation.md index 111c1c50a..702f23934 100644 --- a/gitlab-pages/docs/intro/installation.md +++ b/gitlab-pages/docs/intro/installation.md @@ -42,7 +42,7 @@ ligo --help ## Static Linux binary -We have built ligo executable statically. It should run on most modern Linux distributions. +The ligo executable is statically linked. It should run on most modern Linux distributions. To use it, get it [here](/bin/linux/ligo), make it executable, you're done! @@ -59,7 +59,7 @@ sudo cp ./ligo /usr/local/bin ## Debian Linux package installation -We have produced .deb package with the static executable of ligo. +There is also a .deb package containing the static `ligo` executable. First download [the package](/deb/ligo.deb), and then install using: ```zsh From 5ef842298dd855cf46371ba922073e90ce538465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Suzanne=20Dup=C3=A9ron?= Date: Fri, 22 May 2020 18:34:14 +0000 Subject: [PATCH 7/8] Update installation.md (changed my mind about the wording) --- gitlab-pages/docs/intro/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-pages/docs/intro/installation.md b/gitlab-pages/docs/intro/installation.md index 702f23934..f53d1f862 100644 --- a/gitlab-pages/docs/intro/installation.md +++ b/gitlab-pages/docs/intro/installation.md @@ -59,7 +59,7 @@ sudo cp ./ligo /usr/local/bin ## Debian Linux package installation -There is also a .deb package containing the static `ligo` executable. +A .deb package containing the static `ligo` executable is also available. First download [the package](/deb/ligo.deb), and then install using: ```zsh From a3e330da12b7251f64a5902333214c7b24e89b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Suzanne=20Dup=C3=A9ron?= Date: Fri, 22 May 2020 18:36:00 +0000 Subject: [PATCH 8/8] Update installation.md (punctuation) --- gitlab-pages/docs/intro/installation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-pages/docs/intro/installation.md b/gitlab-pages/docs/intro/installation.md index f53d1f862..cfe77e84a 100644 --- a/gitlab-pages/docs/intro/installation.md +++ b/gitlab-pages/docs/intro/installation.md @@ -42,7 +42,7 @@ ligo --help ## Static Linux binary -The ligo executable is statically linked. It should run on most modern Linux distributions. +The `ligo` executable is statically linked. It should run on most modern Linux distributions. To use it, get it [here](/bin/linux/ligo), make it executable, you're done! @@ -59,7 +59,7 @@ sudo cp ./ligo /usr/local/bin ## Debian Linux package installation -A .deb package containing the static `ligo` executable is also available. +A `.deb` package containing the static `ligo` executable is also available. First download [the package](/deb/ligo.deb), and then install using: ```zsh