Update compiler and merlin version in pkg and ci

ocaml · Jan 10, 2025 · e17f8e9 · e17f8e9
1 parent 91d2cbe
commit e17f8e9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -45,11 +45,11 @@ jobs:
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: "ocaml-base-compiler.5.3.0~beta2"
+          ocaml-compiler: "ocaml-base-compiler.5.3.0"
 
       # Remove this pin once a compatible version of Merlin has been released
       - name: Pin dev Merlin
-        run: opam --cli=2.1 pin --with-version=5.3-503 https://github.com/ocaml/merlin.git#main
+        run: opam --cli=2.1 pin --with-version=5.4-503 https://github.com/ocaml/merlin.git#main
 
       - name: Build and install dependencies
         run: opam install .
@@ -81,7 +81,7 @@ jobs:
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: "ocaml-base-compiler.5.3.0~beta2"
+          ocaml-compiler: "ocaml-base-compiler.5.3.0"
 
       - name: Set git user
         run: |

diff --git a/dune-project b/dune-project
@@ -70,7 +70,7 @@ possible and does not make any assumptions about IO.
   (csexp (>= 1.5))
   (ocamlformat-rpc-lib (>= 0.21.0))
   (odoc :with-doc)
-  (merlin-lib (and (>= 5.3) (< 6.0)))
+  (merlin-lib (and (>= 5.4) (< 6.0)))
   (ppx_yojson_conv :with-dev-setup)))
 
 (package

diff --git a/ocaml-lsp-server.opam b/ocaml-lsp-server.opam
@@ -45,7 +45,7 @@ depends: [
   "csexp" {>= "1.5"}
   "ocamlformat-rpc-lib" {>= "0.21.0"}
   "odoc" {with-doc}
-  "merlin-lib" {>= "5.3" & < "6.0"}
+  "merlin-lib" {>= "5.4" & < "6.0"}
   "ppx_yojson_conv" {with-dev-setup}
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"