update the old pipeline to Seoul

Author: EduardoRFS

Dockerfile

@@ -7,10 +7,12 @@ WORKDIR /ligo
 RUN apk update && apk upgrade && apk --no-cache add \
   build-base snappy-dev alpine-sdk \
   bash ncurses-dev xz m4 git pkgconfig findutils rsync \
-  gmp-dev libev-dev libressl-dev linux-headers pcre-dev perl zlib-dev hidapi-dev \
-  libffi-dev \
-  cargo py3-jsonschema cmake opam
+  gmp-dev libev-dev linux-headers pcre-dev perl zlib-dev hidapi-dev \
+  libffi-dev py3-jsonschema cmake opam rustup \
+  openssl openssl-dev openssl-libs-static
 
+RUN rustup-init --profile minimal --default-toolchain 1.86.0 -y
+ENV PATH="/root/.cargo/bin:${PATH}"
 RUN opam init --disable-sandboxing --bare
 
 # make bls12-381 build ???
@@ -26,15 +28,16 @@ RUN opam var --global os-distribution=arch
 RUN opam update \
   && sh scripts/setup_switch.sh
 COPY scripts/install_opam_deps.sh /ligo/scripts/install_opam_deps.sh
-COPY vendors /ligo/vendors
-COPY vendored-dune /ligo/vendored-dune
 COPY ligo.opam /ligo
 COPY ligo.opam.locked /ligo
 
+COPY vendors /ligo/vendors
+COPY vendored-dune /ligo/vendored-dune
+COPY gitlab-pages /ligo/gitlab-pages
+
 # install all transitive deps
 RUN opam update && sh scripts/install_opam_deps.sh
 
-COPY gitlab-pages /ligo/gitlab-pages
 # Install LIGO
 COPY dune dune-project /ligo/
 COPY configurator /ligo/configurator
@@ -55,27 +58,26 @@ COPY tools/ligo-syntax-highlighting ligo-syntax-highlighting
 ARG ligo_version
 ### TAG_REMOVE_IN_CASE_OF_MR ###
 
+# Generate syntax highlighting files
+RUN mkdir highlighting highlighting/vim highlighting/emacs highlighting/vscode highlighting/textmate \
+  && opam exec -- dune exec ligo-syntax-highlighting/LigoSyntaxHighlighting.exe -- --vim=highlighting/vim --emacs=highlighting/emacs --vscode=highlighting/vscode --textmate=highlighting/textmate
+
+COPY changelog.txt /ligo/changelog.txt
+ENV CHANGELOG_PATH=/ligo/changelog.txt
+
 # Tests
 ##################
 # Code between TAG_REMOVE_IN_CASE_OF_SKIPTEST will be removed in case of skip test.
 # Useful if the package is build but have already been tested
 ##################
 ### TAG_REMOVE_IN_CASE_OF_SKIPTEST ###
 # Run tests
-RUN opam exec -- dune runtest -j 5 --profile static --no-buffer \
+RUN opam exec -- dune runtest --profile static --no-buffer || true
+RUN opam exec -- dune runtest -j 1 --profile static --no-buffer \
 # Coverage (only the overall)
-  && find . -name '*.coverage' | xargs rm -f \
-  && opam exec -- dune clean
+  && find . -name '*.coverage' | xargs rm -f
 ### TAG_REMOVE_IN_CASE_OF_SKIPTEST ###
 
-# Generate syntax highlighting files
-RUN mkdir highlighting highlighting/vim highlighting/emacs highlighting/vscode highlighting/textmate \
-  && opam exec -- dune exec ligo-syntax-highlighting/LigoSyntaxHighlighting.exe -- --vim=highlighting/vim --emacs=highlighting/emacs --vscode=highlighting/vscode --textmate=highlighting/textmate
-
-COPY changelog.txt /ligo/changelog.txt
-ENV CHANGELOG_PATH=/ligo/changelog.txt
-
-
 RUN LIGO_VERSION=$ligo_version opam exec -- dune build -p ligo --profile static \
   # Copy binary now to avoid problems with BISECT_ENABLE below
   && cp /ligo/_build/install/default/bin/ligo /tmp/ligo \

dune-project

@@ -22,6 +22,7 @@
 (using menhir 2.0)
 
 (using coq 0.8)
+
 (using ctypes 0.3)
 
 (package
@@ -30,11 +31,11 @@
  ; When modifying the dependencies, don't forget to run `make lock`
  (depends
   (core
-    (>= v0.16.0))
+   (>= v0.16.0))
   (core_unix
-    (>= v0.16.0))
+   (>= v0.16.0))
   (core_kernel
-    (>= v0.16.0))
+   (>= v0.16.0))
   ocamlgraph
   (menhir
    (= 20230608))
@@ -48,11 +49,10 @@
   tls
   decompress
   (tar
-    (= 2.6.0))
+   (= 2.6.0))
   (tar-unix
-    (= 2.6.0))
+   (= 2.6.0))
   lambda-term
-  parse-argv
   msgpck
   (bin_prot
    (>= v0.16.0))
@@ -69,27 +69,29 @@
   (lwt
    (= 5.7.0))
   lwt_ppx
+  lwt_ssl
   (bisect_ppx
    (>= 2.3.0))
   irmin
   (cmdliner
-   (= 1.1.0))
+   (= 1.3.0))
   ocaml-compiler-libs
   simple-diff
   stdint
   alcotest-lwt
   qcheck-alcotest
   irmin-pack
   pure-splitmix
-;  cohttp-server-lwt-unix
-;  resto-cohttp-self-serving-client
+  ;  cohttp-server-lwt-unix
+  ;  resto-cohttp-self-serving-client
   crunch
   class_group_vdf
   hex
   lwt-canceler
   lwt-exit
   logs
-  cohttp
+  (cohttp
+   (= 5.3.1))
   conduit-lwt-unix
   magic-mime
   seqes
@@ -107,43 +109,33 @@
    (and
     (>= 4.0.0)
     (< 5.0.0)))
-  (ocamlformat
-   (= 0.21.0))
-  (ocamlformat-rpc
-   (= 0.21.0))
   (ocaml-lsp-server
-   (>= 1.14.0))
-  (lsp
-   (and
-    (>= 1.17)
-    (< 1.18)))
+   (>= 1.21.0))
   aches-lwt
   fileutils
   (conduit
-   (= 6.1.0))
+   (= 8.0.0))
   (ocaml-recovery-parser
-   (= 0.2.4))
+   (= 0.3.0))
   (linol
-   (= 0.5))
+   (= 0.10))
   (linol-lwt
-   (= 0.5))
+   (= 0.10))
   grace
+  eio
+  eio_main
+  lwt_eio
   ; For building, testing, or documentation
   (dune
    (>= 3.8 :build))
-  (coq
-   (and
-    (>= 8.12)
-    (< 8.14)
-    :build))
   (alcotest :with-test)
   (ppx_expect :with-test)
   (ppx_inline_test :with-test)
   (odoc :with-test)
   ; For dev
   (ocamlformat
-   (= 0.21.0 :dev))
-  (ocaml-lsp-server
-   (>= 1.14.0 :dev))
+   (= 0.27.0 :dev))
   (ocamlformat-rpc
-   (= 0.21.0 :dev))))
+   (= 0.27.0 :dev))
+  (ocaml-lsp-server
+   (>= 1.21.0 :dev))))

ligo.opam

@@ -26,7 +26,6 @@ depends: [
   "tar" {= "2.6.0"}
   "tar-unix" {= "2.6.0"}
   "lambda-term"
-  "parse-argv"
   "msgpck"
   "bin_prot" {>= "v0.16.0"}
   "ppx_bin_prot" {>= "v0.16.0"}
@@ -38,9 +37,10 @@ depends: [
   "prometheus" {>= "1.2"}
   "lwt" {= "5.7.0"}
   "lwt_ppx"
+  "lwt_ssl"
   "bisect_ppx" {>= "2.3.0"}
   "irmin"
-  "cmdliner" {= "1.1.0"}
+  "cmdliner" {= "1.3.0"}
   "ocaml-compiler-libs"
   "simple-diff"
   "stdint"
@@ -54,7 +54,7 @@ depends: [
   "lwt-canceler"
   "lwt-exit"
   "logs"
-  "cohttp"
+  "cohttp" {= "5.3.1"}
   "conduit-lwt-unix"
   "magic-mime"
   "seqes"
@@ -67,26 +67,25 @@ depends: [
   "mtime" {>= "2.0.0"}
   "zarith" {= "1.13"}
   "tezt" {>= "4.0.0" & < "5.0.0"}
-  "ocamlformat" {= "0.21.0"}
-  "ocamlformat-rpc" {= "0.21.0"}
-  "ocaml-lsp-server" {>= "1.14.0"}
-  "lsp" {>= "1.17" & < "1.18"}
+  "ocaml-lsp-server" {>= "1.21.0"}
   "aches-lwt"
   "fileutils"
-  "conduit" {= "6.1.0"}
-  "ocaml-recovery-parser" {= "0.2.4"}
-  "linol" {= "0.5"}
-  "linol-lwt" {= "0.5"}
+  "conduit" {= "8.0.0"}
+  "ocaml-recovery-parser" {= "0.3.0"}
+  "linol" {= "0.10"}
+  "linol-lwt" {= "0.10"}
   "grace"
+  "eio"
+  "eio_main"
+  "lwt_eio"
   "dune" {>= "3.8" & "3.8" >= build}
-  "coq" {>= "8.12" & < "8.14" & build}
   "alcotest" {with-test}
   "ppx_expect" {with-test}
   "ppx_inline_test" {with-test}
   "odoc" {with-test}
-  "ocamlformat" {"0.21.0" = dev}
-  "ocaml-lsp-server" {"1.14.0" >= dev}
-  "ocamlformat-rpc" {"0.21.0" = dev}
+  "ocamlformat" {"0.27.0" = dev}
+  "ocamlformat-rpc" {"0.27.0" = dev}
+  "ocaml-lsp-server" {"1.21.0" >= dev}
   "odoc" {with-doc}
 ]
 build: [
@@ -105,9 +104,7 @@ build: [
 ]
 dev-repo: "git+https://gitlab.com/ligolang/ligo.git"
 pin-depends: [
-  [ "ocaml-recovery-parser.0.2.4" "git+https://github.com/serokell/ocaml-recovery-parser.git#e05c872d1a0e8074940d995b57556121eddbf0f2" ]
-  [ "linol.0.5" "git+https://github.com/c-cube/linol.git#7730eabf98f657059920369b41d43e657a231ed5" ]
-  [ "linol-lwt.0.5" "git+https://github.com/c-cube/linol.git#7730eabf98f657059920369b41d43e657a231ed5" ]
+  [ "ocaml-recovery-parser.0.3.0" "git+https://github.com/serokell/ocaml-recovery-parser.git#b8207b0c919b84d5096486e59985d0137c0c4d82" ]
   [ "landmarks.1.4" "git+https://github.com/LexiFi/landmarks.git#b0c753cd2a4c4aa00dffdd3be187d8ed592fabf7" ]
   [ "landmarks-ppx.1.4" "git+https://github.com/LexiFi/landmarks.git#b0c753cd2a4c4aa00dffdd3be187d8ed592fabf7" ]
   [ "grace.0.2.0" "git+https://github.com/johnyob/grace.git#d15a6d7d07a2551d1a9934fa79c2cf84c918f990" ]

ligo.opam.template

@@ -1,7 +1,5 @@
 pin-depends: [
-  [ "ocaml-recovery-parser.0.2.4" "git+https://github.com/serokell/ocaml-recovery-parser.git#e05c872d1a0e8074940d995b57556121eddbf0f2" ]
-  [ "linol.0.5" "git+https://github.com/c-cube/linol.git#7730eabf98f657059920369b41d43e657a231ed5" ]
-  [ "linol-lwt.0.5" "git+https://github.com/c-cube/linol.git#7730eabf98f657059920369b41d43e657a231ed5" ]
+  [ "ocaml-recovery-parser.0.3.0" "git+https://github.com/serokell/ocaml-recovery-parser.git#b8207b0c919b84d5096486e59985d0137c0c4d82" ]
   [ "landmarks.1.4" "git+https://github.com/LexiFi/landmarks.git#b0c753cd2a4c4aa00dffdd3be187d8ed592fabf7" ]
   [ "landmarks-ppx.1.4" "git+https://github.com/LexiFi/landmarks.git#b0c753cd2a4c4aa00dffdd3be187d8ed592fabf7" ]
   [ "grace.0.2.0" "git+https://github.com/johnyob/grace.git#d15a6d7d07a2551d1a9934fa79c2cf84c918f990" ]

nix/ligo.nix

@@ -59,7 +59,6 @@ in
           tezt
           tar-unix
           lambda-term
-          parse-argv
           msgpck
           ppx_deriving
           ppx_deriving_yojson

scripts/install_opam_deps.sh

@@ -15,5 +15,5 @@ OPAMSOLVERTIMEOUT=600 OPAMSOLVERTOLERANCE=0.0003 BLST_PORTABLE=y opam install -y
 cd vendors
 git clone https://gitlab.com/ligolang/tezos-ligo.git
 cd tezos-ligo
-git checkout fb4bad17f4d4a8b1df1ba5ea96935f63321e3a30
+git checkout 4d1f2bc8cdc13690328ead815dae7219561b38e5
 cd ../..

scripts/install_vendors_deps.sh

@@ -18,5 +18,5 @@ OPAMSOLVERTIMEOUT=600 OPAMSOLVERTOLERANCE=0.0003 BLST_PORTABLE=y opam install -y
 cd vendors
 git clone https://gitlab.com/ligolang/tezos-ligo.git
 cd tezos-ligo
-git checkout fb4bad17f4d4a8b1df1ba5ea96935f63321e3a30
+git checkout 4d1f2bc8cdc13690328ead815dae7219561b38e5
 cd ../..

scripts/setup_switch.sh

@@ -2,5 +2,5 @@
 set -e
 set -x
 
-printf '' | opam switch create . ocaml-base-compiler.4.14.1 --no-install || true
+printf '' | opam switch create . ocaml-base-compiler.5.2.1 --no-install || true
 eval $(opam config env)