.ci/.gitlab-ci-npm.yml

@@ -39,15 +39,15 @@ esy-windows:
       - platform-windows-x64
       - ligo_installer.exe 
 
-publish_npm_windows_x86:
-  stage: push
+esy-test-windows:
+  tags:
+    - windows
+  stage: test
   needs:
     - job: esy-windows
       artifacts: true
   rules:
     - if: '$CI_COMMIT_REF_NAME == "dev" && $CI_PROJECT_PATH == "ligolang/ligo"'
-      changes:
-        - src/**/*
       when: always
     - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]/ && $CI_PROJECT_PATH == "ligolang/ligo"'
       when: always
@@ -55,6 +55,28 @@ publish_npm_windows_x86:
       changes:
         - esy.json
         - esy.lock/index.json
+        - dune
+      when: always
+  script:
+    - ls
+    - $env:PATH = 'C:\Program Files (x86)\NSIS;C:\Program Files\Git\bin;C:\Users\gitlabrunner\AppData\Roaming\npm;' + $env:PATH
+    - $env:HOME = 'C:/Users/gitlabrunner'
+    - cd ./platform-windows-x64; npm pack; bash -c "npm i -g ./ligolang-$(jq -r .version ../esy.json).tgz --force"; cd ..
+    - bash -c "sh scripts/esy-multiplat-e2e-ci.sh"
+
+publish_npm_windows_x86:
+  stage: push
+  needs:
+    - job: esy-windows
+      artifacts: true
+    - job: esy-test-windows
+      artifacts: false
+  rules:
+    - if: '$CI_COMMIT_REF_NAME == "dev" && $CI_PROJECT_PATH == "ligolang/ligo"'
+      changes:
+        - src/**/*
+      when: always
+    - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]/ && $CI_PROJECT_PATH == "ligolang/ligo"'
       when: always
   script:
     - |      
@@ -67,7 +89,7 @@ publish_npm_windows_x86:
     - status=0 ; ../.ci/scripts/versioning/update_esy_version.sh package.json $VERSION ; npm publish --access public --tag windows$SUFFIX || status=1
     - echo "ligo_npm_build_status $status" | curl --data-binary @- -u '$PROM_PUSH_AUTH' https://pushgateway.prometheus.gcp.marigold.dev/metrics/job/ligo-build-short/branch/$CI_COMMIT_TAG/arch/windows-x86
 
-esy-macos-darwin:
+esy-macos-intel:
   extends: .submodule-clone
   tags:
     - mac
@@ -78,12 +100,13 @@ esy-macos-darwin:
   rules:
     - if: '$CI_COMMIT_REF_NAME == "dev" && $CI_PROJECT_PATH == "ligolang/ligo"'
       when: always
-    - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.0/ && $CI_PROJECT_PATH == "ligolang/ligo"'
+    - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]/ && $CI_PROJECT_PATH == "ligolang/ligo"'
       when: always
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_PATH == "ligolang/ligo"'
       changes:
         - esy.json
         - esy.lock/index.json
+        - ligo.opam
       when: always
   script:
     - mkdir -p ~/.npm
@@ -100,15 +123,13 @@ esy-macos-darwin:
     paths:
       - platform-darwin
 
-publish_npm_darwin:
-  stage: push
-  needs:
-    - job: esy-macos-darwin
-      artifacts: true
+esy-test-macos-intel:
+  stage: test
+  tags:
+    - mac
+    - i7
   rules:
     - if: '$CI_COMMIT_REF_NAME == "dev" && $CI_PROJECT_PATH == "ligolang/ligo"'
-      changes:
-        - src/**/*
       when: always
     - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]/ && $CI_PROJECT_PATH == "ligolang/ligo"'
       when: always
@@ -116,6 +137,31 @@ publish_npm_darwin:
       changes:
         - esy.json
         - esy.lock/index.json
+        - dune
+      when: always
+  needs:
+    - job: esy-macos-intel
+      artifacts: true
+  script:
+    - mkdir -p ~/.npm
+    - npm config set prefix '~/.npm'
+    - export PATH=~/.npm/bin:$PATH
+    - npm i --force -g ./platform-darwin
+    - sh scripts/esy-multiplat-e2e-ci.sh
+
+publish_npm_darwin_x86_64:
+  stage: push
+  needs:
+    - job: esy-macos-intel
+      artifacts: true
+    - job: esy-test-macos-intel
+      artifacts: false
+  rules:
+    - if: '$CI_COMMIT_REF_NAME == "dev" && $CI_PROJECT_PATH == "ligolang/ligo"'
+      changes:
+        - src/**/*
+      when: always
+    - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]/ && $CI_PROJECT_PATH == "ligolang/ligo"'
       when: always
   script:
     - |      
@@ -145,6 +191,7 @@ esy-macos-m1:
       changes:
         - esy.json
         - esy.lock/index.json
+        - dune
       when: always
   script:
     - mkdir -p ~/.npm
@@ -162,11 +209,39 @@ esy-macos-m1:
     paths:
       - platform-darwin-arm64
 
+esy-test-macos-m1:
+  stage: test
+  tags:
+    - mac
+    - m1
+  rules:
+    - if: '$CI_COMMIT_REF_NAME == "dev" && $CI_PROJECT_PATH == "ligolang/ligo"'
+      when: always
+    - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]/ && $CI_PROJECT_PATH == "ligolang/ligo"'
+      when: always
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_PATH == "ligolang/ligo"'
+      changes:
+        - esy.json
+        - esy.lock/index.json
+        - dune
+      when: always
+  needs:
+    - job: esy-macos-m1
+      artifacts: true
+  script:
+    - mkdir -p ~/.npm
+    - npm config set prefix '~/.npm'
+    - export PATH=~/.npm/bin:$PATH
+    - npm i --force -g ./platform-darwin-arm64
+    - sh scripts/esy-multiplat-e2e-ci.sh
+
 publish_npm_darwin_arm64:
   stage: push
   needs:
     - job: esy-macos-m1
       artifacts: true
+    - job: esy-test-macos-m1
+      artifacts: false
   rules:
     - if: '$CI_COMMIT_REF_NAME == "dev" && $CI_PROJECT_PATH == "ligolang/ligo"'
       changes:
@@ -174,11 +249,6 @@ publish_npm_darwin_arm64:
       when: always
     - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]/ && $CI_PROJECT_PATH == "ligolang/ligo"'
       when: always
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_PATH == "ligolang/ligo"'
-      changes:
-        - esy.json
-        - esy.lock/index.json
-      when: always
   script:
     - |      
       if [[ $CI_COMMIT_REF_NAME == "dev" ]]; then
@@ -190,3 +260,24 @@ publish_npm_darwin_arm64:
     - status=0  ; ../.ci/scripts/versioning/update_esy_version.sh package.json $VERSION ; npm publish --access public --tag macos-m1$SUFFIX || status=1
     - echo "ligo_npm_build_status $status" | curl --data-binary @- -u '$PROM_PUSH_AUTH' https://pushgateway.prometheus.gcp.marigold.dev/metrics/job/ligo-build-short/branch/$CI_COMMIT_TAG/arch/darwin-arm64
 
+publish_ligojs:
+  stage: push
+  needs:
+    - job: docker_build
+      artifacts: true
+  rules:
+    - if: '$CI_COMMIT_REF_NAME == "dev" && $CI_PROJECT_PATH == "ligolang/ligo"'
+      changes:
+        - src/**/*
+      when: always
+    - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]/ && $CI_PROJECT_PATH == "ligolang/ligo"'
+      when: always
+  script:
+    - |      
+      if [[ $CI_COMMIT_REF_NAME == "dev" ]]; then
+        SUFFIX=-dev
+      fi
+    - cd ./ligo-npm
+    - chmod 664 package.json
+    - VERSION=$(../.ci/scripts/versioning/determine_esy_version.sh package.json windows)
+    - status=0 ; ../.ci/scripts/versioning/update_esy_version.sh package.json $VERSION ; npm publish --access public || status=1

.ci/.gitlab-ci-release.yml

@@ -269,6 +269,8 @@ bottle-ventura-i7:
 
 bottle-ventura-m1:
   stage: pretooling
+  variables:
+    GIT_STRATEGY: clone
   tags:
     - mac
     - m1
@@ -301,6 +303,8 @@ bottle-ventura-m1:
 
 update-bottle-reference:
   stage: pretooling
+  variables:
+    GIT_STRATEGY: clone
   needs:
       - job: bottle-ventura-i7
         artifacts: true
@@ -442,6 +446,39 @@ publish-AUR-package:
   rules:
     - if: ($CI_COMMIT_BRANCH =~ /^release/ &&  $TRIGGER_DOC_UPDATE != null )
       when: always
+
+
+#######################################################################
+# Following script is executed when pipeline has executed Tag process
+# Related to the update nixpkg https://github.com/NixOS/nixpkgs
+#######################################################################
+
+publish-nixpkg:
+  stage: push
+  script:
+    - git clone "https://github.com/laucans/nixpkgs.git"
+    - PRECEDENT_LIGO_VERSION_NIX=$(.ci/scripts/nix/retrieve_version.sh nixpkgs/pkgs/development/compilers/ligo/default.nix)
+    - .ci/scripts/nix/update_ligo_default_nix_file.sh nixpkgs/pkgs/development/compilers/ligo/default.nix $RELEASE_VERSION
+    - cd nixpkgs
+    - git remote rm origin && git remote add origin https://ligolangbot:${GITLAB_LIGO_PUBLIC_REPO_TOKEN}@github.com/ligolang/nixpkgs.git
+    - git add pkgs/development/compilers/ligo/default.nix
+    - git status
+    - "git commit -am \"ligo: ${PRECEDENT_LIGO_VERSION_NIX} -> ${RELEASE_VERSION}\""
+    - git remote -v
+    - git push -u origin master:$(../.ci/scripts/nix/generate_nixpkgs_branch_name.sh $RELEASE_VERSION)
+    - ../.ci/scripts/nix/generate_pr.sh "ligolang:$(../.ci/scripts/nix/generate_nixpkgs_branch_name.sh $RELEASE_VERSION)" $PRECEDENT_LIGO_VERSION_NIX $RELEASE_VERSION $GITLAB_LIGO_PUBLIC_REPO_TOKEN
+    - MESSAGE="New pull request to update ligo has been generated on https://github.com/NixOS/nixpkgs"
+  # U01MBUD7YG6 = Ulrik who is owner of nixpkgs and can merge PR
+    - "curl -d \"text=${MESSAGE}\" -d 'channel=U01MBUD7YG6' -H \"Authorization: Bearer ${SLACK_LIGO_ALERTER_TOKEN}\" -X POST https://slack.com/api/chat.postMessage --trace-ascii /dev/stdout"
+    - "curl -d \"text=${MESSAGE}\" -d 'channel=U02LTGFM85S' -H \"Authorization: Bearer ${SLACK_LIGO_ALERTER_TOKEN}\" -X POST https://slack.com/api/chat.postMessage --trace-ascii /dev/stdout"
+  needs:
+    - job: build_release_env_vars
+      artifacts: true
+  rules:
+    - if: ($CI_COMMIT_BRANCH =~ /^release/ &&  $TRIGGER_DOC_UPDATE != null )
+      when: always 
+
+
 #######################################################################
 # Following script is executed when pipeline has executed Tag process
 # Related to the update of Gitpod

.ci/.gitlab-ci-webide-new.yml

@@ -29,7 +29,7 @@ webide-backend-checks:
     - nix build .#packages.x86_64-linux.tezos-client --out-link tezos-client
     - export LIGO_PATH=$PWD/ligo/bin/ligo
     - export OCTEZ_CLIENT_PATH=$PWD/tezos-client/bin/octez-client
-    - export DOCKER_LIGO_VERSION=0.61.0
+    - export DOCKER_LIGO_VERSION=0.62.0
     # These tests need docker, so they cannot be easily run as a flake check :(
     - nix build .#tests.x86_64-linux.ligo-webide-backend-test
     - cd ligo-webide-backend && ../result/bin/ligo-webide-backend-test

.ci/.gitlab-ci-webide.yml

@@ -5,21 +5,28 @@
 webide-define-image-tag:
   extends: .docker-image
   stage: pretooling
+  needs:
+    - job: changelog
+      artifacts: false
   rules:
-    - if: '$CI_COMMIT_BRANCH == "webide-release/frontend"'
+    - if: ($CI_MERGE_REQUEST_EVENT_TYPE == "merge_train")
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TITLE =~ /^[w;W]eb[I;i]de-/'
       when: always
     - if: '$CI_COMMIT_BRANCH == "dev"'
       changes:
-        - tools/webide-new/ligo-webide-frontend/**/*
+        - tools/webide-new/ligo-webide-backend/**/*
       when: always
     - if: '$CI_COMMIT_BRANCH == "dev"'
       changes:
-        - tools/webide-new/ligo-webide-backend/**/*
+        - tools/webide-new/ligo-webide-frontend/**/*
+        - tools/vscode/syntaxes
       when: always
   script:
     - FORMATED_CI_JOB_STARTED_AT="${CI_JOB_STARTED_AT//:/-}"
-    - WEBIDE_NEW_IMAGE_TAG="registry.gitlab.com/${CI_PROJECT_PATH}/ligo_webide_new:${FORMATED_CI_JOB_STARTED_AT}-${CI_COMMIT_SHORT_SHA}"
-    - WEBIDE_FRONTEND_NEW_IMAGE_TAG="registry.gitlab.com/${CI_PROJECT_PATH}/ligo_webide_frontend_new:${FORMATED_CI_JOB_STARTED_AT}-${CI_COMMIT_SHORT_SHA}"
+    - NPR_ENVIRONMENT="$(echo ${CI_MERGE_REQUEST_TITLE} | grep -io 'webide-[ab]' | head -1 | sed 's/^[wW][eE][bB][Ii][dD][eE]//')" || true
+    - WEBIDE_NEW_IMAGE_TAG="registry.gitlab.com/${CI_PROJECT_PATH}/ligo_webide_new:${FORMATED_CI_JOB_STARTED_AT}-${CI_COMMIT_SHORT_SHA}${NPR_ENVIRONMENT}"
+    - WEBIDE_FRONTEND_NEW_IMAGE_TAG="registry.gitlab.com/${CI_PROJECT_PATH}/ligo_webide_frontend_new:${FORMATED_CI_JOB_STARTED_AT}-${CI_COMMIT_SHORT_SHA}${NPR_ENVIRONMENT}"
     - echo "WEBIDE_NEW_IMAGE_TAG=${WEBIDE_NEW_IMAGE_TAG}" >> webide-img-tag.env
     - echo "WEBIDE_FRONTEND_NEW_IMAGE_TAG=${WEBIDE_FRONTEND_NEW_IMAGE_TAG}" >> webide-img-tag.env
   artifacts:
@@ -33,6 +40,8 @@ webide-new-backend-build:
     - job: changelog
       artifacts: false
   rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TITLE =~ /^[w;W]eb[I;i]de-/'
+      when: never
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       changes:
         - tools/webide-new/ligo-webide-backend/**/*
@@ -49,6 +58,8 @@ webide-new-frontend-build:
     - job: changelog
       artifacts: false
   rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TITLE =~ /^[w;W]eb[I;i]de-/'      
+      when: never
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       changes:
         - tools/webide-new/ligo-webide-frontend/ligo-ide/**/*
@@ -70,9 +81,9 @@ webide-new-backend-build-and-push-backend:
     - job: webide-define-image-tag
       artifacts: true 
   rules:
-    - if: '$CI_COMMIT_BRANCH == "dev"'
-      changes:
-        - tools/webide-new/ligo-webide-backend/**/*
+    - if: ($CI_MERGE_REQUEST_EVENT_TYPE == "merge_train")
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TITLE =~ /^[w;W]eb[I;i]de-/'      
       when: always
   script:
     - docker build tools/webide-new/ligo-webide-backend -t ${WEBIDE_NEW_IMAGE_TAG}
@@ -88,13 +99,13 @@ webide-new-frontend-build-and-push:
     - job: webide-define-image-tag
       artifacts: true
   rules:
-    - if: '$CI_COMMIT_BRANCH == "dev"'
-      changes:
-        - tools/webide-new/ligo-webide-frontend/**/*
+    - if: ($CI_MERGE_REQUEST_EVENT_TYPE == "merge_train")
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TITLE =~ /^[w;W]eb[I;i]de-/'      
       when: always
   script:
     - docker buildx build --build-context syntaxes=tools/vscode/syntaxes
-      --build-arg backend_url=backend.ligo-webide-v2.gcp-npr.marigold.dev
+      --build-arg backend_url=backend.ligo-webide-v2${NPR_ENVIRONMENT}.gcp-npr.marigold.dev
       --build-arg http_protocol=https
       -f tools/webide-new/ligo-webide-frontend/ligo-ide/Dockerfile 
       tools/webide-new/ligo-webide-frontend/ligo-ide 
@@ -104,6 +115,23 @@ webide-new-frontend-build-and-push:
   after_script:
     - docker image rm "${WEBIDE_FRONTEND_NEW_IMAGE_TAG}" >/dev/null 2>&1 || true
 
+webide-new-release-backend-build-and-push:
+  extends: .docker-image
+  stage: deploy
+  needs:
+    - job: webide-define-image-tag
+      artifacts: true
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "dev"'
+      changes:
+        - tools/webide-new/ligo-webide-backend/**/*
+      when: always
+  script:
+    - docker build tools/webide-new/ligo-webide-backend -t ${WEBIDE_NEW_IMAGE_TAG}-release
+    - echo "${CI_BUILD_TOKEN}" | docker login -u gitlab-ci-token --password-stdin registry.gitlab.com
+    - docker push "${WEBIDE_NEW_IMAGE_TAG}-release"
+  after_script:
+    - docker image rm "${WEBIDE_NEW_IMAGE_TAG}-release" >/dev/null 2>&1 || true
 
 webide-new-release-frontend-build-and-push:
   extends: .docker-image
@@ -112,7 +140,10 @@ webide-new-release-frontend-build-and-push:
     - job: webide-define-image-tag
       artifacts: true
   rules:
-    - if: '$CI_COMMIT_BRANCH == "webide-release/frontend"'
+    - if: '$CI_COMMIT_BRANCH == "dev"'
+      changes:
+        - tools/webide-new/ligo-webide-frontend/**/*
+        - tools/vscode/syntaxes
       when: always
   script:
     - docker buildx build --build-context syntaxes=tools/vscode/syntaxes
@@ -120,8 +151,8 @@ webide-new-release-frontend-build-and-push:
       --build-arg http_protocol=https
       -f tools/webide-new/ligo-webide-frontend/ligo-ide/Dockerfile 
       tools/webide-new/ligo-webide-frontend/ligo-ide 
-      -t release-${WEBIDE_FRONTEND_NEW_IMAGE_TAG}
+      -t ${WEBIDE_FRONTEND_NEW_IMAGE_TAG}-release
     - echo "${CI_BUILD_TOKEN}" | docker login -u gitlab-ci-token --password-stdin registry.gitlab.com
-    - docker push "release-${WEBIDE_FRONTEND_NEW_IMAGE_TAG}"
+    - docker push "${WEBIDE_FRONTEND_NEW_IMAGE_TAG}-release"
   after_script:
-    - docker image rm "${WEBIDE_FRONTEND_NEW_IMAGE_TAG}" >/dev/null 2>&1 || true
+    - docker image rm "${WEBIDE_FRONTEND_NEW_IMAGE_TAG}-release" >/dev/null 2>&1 || true

.ci/.metadata.yml

-LAST_TAG_JOB_ID: "3857618664"
-LAST_STABLE_VERSION: 0.59.0
-LAST_RELEASE_VERSION: 0.61.0
+LAST_TAG_JOB_ID: "3942174485.ci"
+LAST_STABLE_VERSION: 0.60.0
+LAST_RELEASE_VERSION: 0.62.0

.ci/scripts/nix/generate_nixpkgs_branch_name.sh

+#!/usr/bin/env bash
+
+if [ $# -eq 0 ]; then
+  echo "VERSION is mandatory"
+  exit 1
+fi
+
+VERSION=$1
+
+VERSION_UNDERSCORES=${VERSION//./_}
+
+echo "ligo--${VERSION_UNDERSCORES}"

.ci/scripts/nix/generate_pr.sh

+#!/usr/bin/env bash
+
+branch_name=$1
+ligo_precedent_version=$2
+ligo_new_version=$3
+token_github_api=$4
+
+pr_name="draft: ligo: $ligo_precedent_version -> $ligo_new_version"
+
+pr_description=$(cat $(dirname "${BASH_SOURCE[0]}")/pr_description.md)
+
+curl --location --request POST "https://api.github.com/repos/NixOS/nixpkgs/pulls" \
+    --header "Authorization: Bearer $token_github_api" \
+    --header "Content-Type: application/json" \
+    --data-raw "{
+    \"title\": \"$pr_name\",
+    \"head\": \"$branch_name\",
+    \"base\": \"master\",
+    \"body\": \"$pr_description\",
+    \"draft\": true,
+    \"reviewers\": [\"ulrikstrid\"]
+}"

.ci/scripts/nix/pr_description.md

+###### Description of changes \n\nUpdate ligo version to latest one \n\n###### Things done \n\n- Built on platform(s)\n  - [ ] x86_64-linux\n  - [ ] aarch64-linux\n  - [ ] x86_64-darwin\n  - [ ] aarch64-darwin\n- [ ] For non-Linux: Is `sandbox = true` set in `nix.conf`? (See [Nix manual](https://nixos.org/manual/nix/stable/command-ref/conf-file.html))\n- [ ] Tested, as applicable:\n  - [NixOS test(s)](https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests) (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))\n  - and/or [package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests)\n  - or, for functions and \"core\" functionality, tests in [lib/tests](https://github.com/NixOS/nixpkgs/blob/master/lib/tests) or [pkgs/test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/test)\n  - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages\n- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run \"nixpkgs-review rev HEAD\"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)\n- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)\n- [23.05 Release Notes (or backporting 22.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2305-release-notes)\n  - [ ] (Package updates) Added a release notes entry if the change is major or breaking\n  - [ ] (Module updates) Added a release notes entry if the change is significant\n  - [ ] (Module addition) Added a release notes entry if adding a new NixOS module\n- [x] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).\n
+

.ci/scripts/nix/retrieve_version.sh

+#!/usr/bin/env bash
+
+NIX_FILE=$1
+
+VERSION_REGEX_PATTERN="version = \"([0-9]+\.[0-9]+\.[0-9]+)\";"
+
+sed -rn "s/$VERSION_REGEX_PATTERN/\1/p" $NIX_FILE | tr -d ' '

.ci/scripts/nix/update_ligo_default_nix_file.sh

+#!/usr/bin/env bash
+
+FILEPATH=$1
+VERSION=$2
+
+VERSION_REGEX_PATTERN="version = \"[0-9]+\.[0-9]+\.[0-9]+\";"
+NIX_SHA256_SRI_REGEX_PATTERN='(sha256 = ").*(";)'
+
+SED_IN_PLACE_COMMAND=(sed -i)
+if [ "$(uname)" == "Darwin" ]; then
+  # Sed is different in macos. https://stackoverflow.com/questions/7573368/in-place-edits-with-sed-on-os-x
+  SED_IN_PLACE_COMMAND=(sed -i '')
+fi
+
+# Replace SRI for nix
+SRI_LIGO_BINARY_HASH=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 --unpack https://gitlab.com/ligolang/ligo/-/archive/$VERSION/ligo-$VERSION.zip))
+echo "update distribution reference SRI_LIGO_BINARY_HASH = $SRI_LIGO_BINARY_HASH"
+
+# Idk why, all nixPkgs files are 644, so I change it temporarly to be able to edit it
+chmod 664 $FILEPATH
+"${SED_IN_PLACE_COMMAND[@]}" -E "s#$VERSION_REGEX_PATTERN#version = \"$VERSION\";#" "$FILEPATH"
+"${SED_IN_PLACE_COMMAND[@]}" -E "s#$NIX_SHA256_SRI_REGEX_PATTERN#\1$SRI_LIGO_BINARY_HASH\2#" "$FILEPATH"
+chmod 644 $FILEPATH

.ci/scripts/update_distribution_references_with_release.sh

@@ -12,16 +12,14 @@ DISTRIBUTION_URL_PATTERN_BINARY_NEXT="https://ligolang.org/bin/linux/ligo"
 DISTRIBUTION_URL_GITLAB_ARTIFACT_REGEX_PATTERN_RELEASE="(.*https://gitlab\.com/ligolang/ligo/-/jobs/)[0-9]{10}(/artifacts/raw\/(ligo\.deb|ligo))"
 
 VERSION_REGEX_PATTERN="[0-9]+\.[0-9]+\.[0-9]+"
-NIX_SHA256_SRI_REGEX_PATTERN='(sha256 = ").*(";)'
 
 DEB_GITLAB_ARTIFACT_URL="https://gitlab.com/ligolang/ligo/-/jobs/$1/artifacts/raw/ligo.deb"
 BINARY_GITLAB_ARTIFACT_URL="https://gitlab.com/ligolang/ligo/-/jobs/$1/artifacts/raw/ligo"
 
 FILES_PATH_TO_EDIT=(
-    "$ROOT_FOLDER/tools/webide/Dockerfile"
+    "$ROOT_FOLDER/tools/webide-new/ligo-webide-backend/Dockerfile"
     "$ROOT_FOLDER/gitlab-pages/docs/intro/installation.md"
     "$ROOT_FOLDER/gitlab-pages/docs/tutorials/getting-started/getting-started.md"
-    "$ROOT_FOLDER/nix/get_ligo_light.nix"
     "$ROOT_FOLDER/gitlab-pages/docs/tutorials/getting-started/getting-started.md"
 )
 
@@ -48,8 +46,5 @@ do
     "${SED_IN_PLACE_COMMAND[@]}" -E "s|$VERSION_REGEX_PATTERN|$CURRENT_VERSION|g" $filepath
 done
 
-# Replace SRI for nix 
-# SRI_LIGO_BINARY_HASH=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 --executable https://gitlab.com/ligolang/ligo/-/jobs/$1/artifacts/raw/ligo))
-# echo "update distribution reference SRI_LIGO_BINARY_HASH = $SRI_LIGO_BINARY_HASH"
-# "${SED_IN_PLACE_COMMAND[@]}" -E "s#$NIX_SHA256_SRI_REGEX_PATTERN#\1$SRI_LIGO_BINARY_HASH\2#" "$ROOT_FOLDER/nix/get_ligo.nix"
+
 

.gitlab-ci.yml

@@ -11,6 +11,7 @@ stages:
   - tools-build                     # build projects from 'tools'
   - tools-check                     # run tests for projects from 'tools'
   - tooling                         # build miscellaneous tooling-related things (website, changelog..)
+  - test                            # e2e tests
   - push                            # deploy docker images, pages, releases (tag)
   - deploy                          # deploy web IDE, website preview
   - release                         # Manage branch matching ^release/*
@@ -106,6 +107,7 @@ docker_build:
       --build-arg=changelog_path=changelog.txt
       -t ${LIGO_IMAGE_TAG}
     # Copy JSOO PoC IDE
+    - docker cp $(docker create ${LIGO_IMAGE_TAG}-builder):/ligo/npm ./ligo-npm
     - docker cp $(docker create ${LIGO_IMAGE_TAG}-builder):/ligo/jsoo/dist ./ligo-demo-ide
     - docker save -o ligo.tar.gz ${LIGO_IMAGE_TAG}
   after_script:
@@ -113,6 +115,8 @@ docker_build:
   artifacts:
     expose_as: "Ligo docker image - light -"
     paths:
+      - ligo-npm
+      - ligo-demo-ide
       - ligo.tar.gz
 docker_extract:
   stage: docker-extract
@@ -149,7 +153,6 @@ docker_extract:
       - ligo.deb
       - doc
       - highlighting
-      - ligo-demo-ide
 
 check-generated-highlighting:
   stage: tooling
@@ -274,7 +277,7 @@ algolia-crawl:
   script:
     # We want to trigger the job after page:deploy to reindex the website but job can't depends on page:deploy. So we put a artificial sleep of 10 seconds before triggering algolia crawler to be sure that it'll works
     - |
-      sleep 10
+      sleep 20
       curl -X post  -H "Content-Type: application/json" --user ${ALGOLIA_CRAWLER_ID}:${ALGOLIA_CRAWLER_TOKEN} https://crawler.algolia.com/api/1/crawlers/bb0597ba-5abc-45ba-bdf9-99f8152e87b0/reindex
   rules:
     - if: '$CI_COMMIT_REF_NAME == "dev" && $CI_PROJECT_PATH == "ligolang/ligo"'

.gitlab/merge_request_templates/debugger.md

 ## Motivation and Context
 <!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here using **Related Issue(s)**: #issue_num(s). -->
+<!--- If it fixes an open issue, please link to the issue in `Related issues` section -->
 
-**Related Issue(s)**: <!-- insert the related issue here, or none if not appliable -->
+### Related issues
+
+Resolves <!-- insert the related issue here, or none if not appliable -->.
 
 ### :white_check_mark: Checklist for the LIGO Debugger
 

.gitlab/merge_request_templates/lsp.md

 ## Motivation and Context
 <!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here using **Related Issue(s)**: #issue_num(s). -->
+<!--- If it fixes an open issue, please link to the issue in `Related issues` section -->
 
-**Related Issue(s)**: <!-- insert the related issue here, or none if not appliable -->
+### Related issues
+
+Resolves <!-- insert the related issue here, or none if not appliable -->.
 
 ### :white_check_mark: Checklist for the LIGO Language Server
 

Dockerfile

@@ -46,6 +46,8 @@ COPY tools/ligo-syntax-highlighting ligo-syntax-highlighting
 # JSOO
 COPY jsoo /ligo/jsoo
 COPY Makefile /ligo
+COPY npm /ligo/npm
+COPY examples /ligo/examples
 
 # Run tests
 RUN opam exec -- dune build @check \
@@ -74,6 +76,8 @@ RUN LIGO_VERSION=$(/ligo/scripts/version.sh) opam exec -- dune build -p ligo --p
   && opam exec -- dune build @doc
 RUN npm i -g webpack-cli
 RUN cd /ligo && opam exec -- make build-demo-webide
+RUN cd /ligo/npm && rm /ligo/npm/ligolang-*.tgz ; npm i && npm run build && npm pack
+RUN cd /ligo/examples/ligojs && npm i && npm run build:webpack
 
 FROM esydev/esy:nightly-alpine as esy
 

HomebrewFormula/ligo.rb

@@ -4,15 +4,15 @@ class Ligo < Formula
   license "MIT"
 
   # We clone repo explicitely to preserve the information about git submodules
-  url "https://gitlab.com/ligolang/ligo.git", tag: "0.61.0", revision: "cc2f894abf7ec5afb7f5fddb8b1f85c5a36773f7"
-  version "0.61.0"
+  url "https://gitlab.com/ligolang/ligo.git", tag: "0.62.0", revision: "750073055d50217e0b633c0d09d0c23212c47884"
+  version "0.62.0"
   head "https://gitlab.com/ligolang/ligo.git", branch: "dev"
 
 
   bottle do
     root_url "https://gitlab.com/api/v4/projects/12294987/packages/generic/ligo_bottle/current"
-    sha256 cellar: :any, arm64_ventura: "bfe355a760fa8f70caab60d93e00dab712cf3d9dddb9e6a99865992539fca10c"
-    sha256 cellar: :any, ventura: "b7f408685a76aefe57030809bdf123a08b09ed0804db81bf5052bf6a22942278"
+    sha256 cellar: :any, arm64_ventura: "dcdeeace6d56f683dc0d901835218e7419802e8c5f84142383c42fcd95248142"
+    sha256 cellar: :any, ventura: "5b118369a50c52ecf3ddde63c73ef0a8cfb68344bbbd6599dde1bda43e70d72a"
   end
 
   build_dependencies = %w[opam rust hidapi pkg-config gnu-sed]
@@ -32,7 +32,7 @@ class Ligo < Formula
 
   def install
     # ligo version is taken from the environment variable in build-time
-    ENV["LIGO_VERSION"] = "0.61.0"
+    ENV["LIGO_VERSION"] = "0.62.0"
     # avoid opam prompts
     ENV["OPAMYES"] = "true"
 

HomebrewFormula/ligo@0.59.0.rb → HomebrewFormula/ligo@0.62.0.rb

-class Ligo < Formula
+class LigoAT0620 < Formula
   desc "Friendly Smart Contract Language for Tezos"
   homepage "https://ligolang.org/"
   license "MIT"
 
   # We clone repo explicitely to preserve the information about git submodules
-  url "https://gitlab.com/ligolang/ligo.git", tag: "0.59.0", revision: "cbe67ba18cb7c7b26c036d9b1429d3baec0b6f36"
-  version "0.59.0"
+  url "https://gitlab.com/ligolang/ligo.git", tag: "0.62.0", revision: "750073055d50217e0b633c0d09d0c23212c47884"
+  version "0.62.0"
   head "https://gitlab.com/ligolang/ligo.git", branch: "dev"
 
 
   bottle do
     root_url "https://gitlab.com/api/v4/projects/12294987/packages/generic/ligo_bottle/current"
-      sha256 cellar: :any, arm64_ventura: "dc62af29a4299636ab490e3d47c351407337b15cb495434b388ce0260d3188f6"
-      sha256 cellar: :any, ventura: "2969ccbd8e640531006dc659975c84918dd72115c72b6306bca3b895f740309f"
+    sha256 cellar: :any, arm64_ventura: "dcdeeace6d56f683dc0d901835218e7419802e8c5f84142383c42fcd95248142"
+    sha256 cellar: :any, ventura: "5b118369a50c52ecf3ddde63c73ef0a8cfb68344bbbd6599dde1bda43e70d72a"
   end
 
   build_dependencies = %w[opam rust hidapi pkg-config gnu-sed]
@@ -32,7 +32,7 @@ class Ligo < Formula
 
   def install
     # ligo version is taken from the environment variable in build-time
-    ENV["LIGO_VERSION"] = "0.59.0"
+    ENV["LIGO_VERSION"] = "0.62.0"
     # avoid opam prompts
     ENV["OPAMYES"] = "true"
 

Makefile

@@ -65,7 +65,7 @@ _build/default/src/bin/js_main.bc.js: ./src/bin/js_main.ml ./src/bin/dune
 
 
 .PHONY: build-demo-webide demo-webide-start
-build-demo-webide:
+build-demo-webide: _build/default/src/bin/js_main.bc.js
 	cd jsoo && npm i && npm run build
 
 demo-webide-start:

changelog/2333

+
+author: rinderkn
+description: "\\n\\n"
+merge_request: '2333'
+title: "Prepare transpilation of PascaLIGO to JsLIGO"
+type: internal
+            
\ No newline at end of file

changelog/2423

+
+author: melwyn95
+description: "\\nFor a LIGO package with name `@ligo/fa`\\n\\n### Before\\n\\n\\n```\\n$ ligo.61 publish --dry-run\\n==> Reading manifest... Done\\n==> Validating manifest file... Done\\n==> Finding project root... Done\\n==> Packing tarball... An internal error ocurred. Please, contact the developers.\\n(Sys_error \"/tmp/@ligo/fa675f7d1.0.1: No such file or directory\").\\n\\n```\\n\\n### After\\n\\n\\n```\\n$ ligo publish --dry-run\\n==> Reading manifest... Done\\n==> Validating manifest file... Done\\n==> Finding project root... Done\\n==> Packing tarball... Done\\n    publishing: @ligo/fa@1.0.1\\n    === Tarball Details ===\\n    name:          @ligo/fa\\n    version:       1.0.1\\n    filename:      @ligo/fa-1.0.1.tgz\\n    package size:  36.4 kB\\n    unpacked size: 249.5 kB\\n    shasum:        a1755ccfecb90d06440aef9d0808ec1499fc22f4\\n    integrity:     sha512-c986ef7bc12cd[...]9b6f8c626f8fba7\\n    total files:   49\\n\\n```\\n\\n"
+merge_request: '2423'
+title: "Fix bugs in `ligo publish`"
+type: fixed
+            
\ No newline at end of file