Merge branch 'update-documentation' into 'dev'

Nix fixes

See merge request ligolang/ligo!631

.gitlab-ci.yml

@@ -7,6 +7,7 @@ variables:
 stages:
   - build
   - push
+  - ide-deploy
   - versioning
 
 .docker-image:
@@ -29,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:
@@ -66,15 +68,12 @@ test:
     paths:
       - coverage
 
-# FIXME For some reason, e2e tests can't build on CI.
+webide-e2e:
-.webide-e2e:
   extends: .nix
-  rules:
+  only:
-    - changes:
+    - merge_requests
-        - tools/webide/**
+    - dev
-      when: always
+    - /^.*-run-dev$/
-    - if: '$CI_COMMIT_REF_NAME =~ /^(dev|.*-run-dev)$/ && $CI_PROJECT_PATH == "ligolang/ligo"'
-      when: always
   script:
     - nix-build nix -A ligo-editor.e2e
 
@@ -121,7 +120,6 @@ webide-docker:
     paths:
       - webide.tar.gz
 
-
 webide-push:
   extends: .docker-image
   dependencies:
@@ -138,6 +136,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:

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
+
+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!
+
+```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. 
+A `.deb` package containing the static `ligo` executable is also available.
-First download one of the packages below, and then install using:
+First download [the package](/deb/ligo.deb), and then install using: 
 
+```zsh
+sudo apt install ./ligo.deb
 ```
-sudo apt install ./<package_name_here>.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
 

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