Merge pull request #1422 from smorimoto/add-missing-depends

Add missing dev depends

Author: rgrinberg

.github/workflows/build-and-test.yml

@@ -20,8 +20,6 @@ jobs:
           - ubuntu-latest
           - macos-latest
           - windows-latest
-        ocaml-compiler:
-          - "5.2"
 
     runs-on: ${{ matrix.os }}
 
@@ -44,11 +42,10 @@ jobs:
       - name: Install npm packages
         run: yarn install --frozen-lockfile
 
-      - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
+      - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          allow-prerelease-opam: true
+          ocaml-compiler: "5.2"
 
       # Remove this pin once a compatible version of Merlin has been released
       # - name: Pin dev Merlin
@@ -82,10 +79,9 @@ jobs:
           submodules: true
 
       - name: Set-up OCaml
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: "5.2"
-          allow-prerelease-opam: true
 
       - name: Set git user
         run: |
@@ -96,7 +92,8 @@ jobs:
         run: |
           opam install . --deps-only
           opam exec -- make coverage-deps install-test-deps
+
       - run: opam exec -- make test-coverage
         env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_REPO_TOKEN: ${{ github.token }}
           PULL_REQUEST_NUMBER: ${{ github.event.number }}

dune-project

@@ -37,7 +37,8 @@ possible and does not make any assumptions about IO.
   (ppx_expect (and (>= v0.17.0) :with-test))
   (uutf (>= 1.0.2))
   (odoc :with-doc)
-  (ocaml (>= 4.14))))
+  (ocaml (>= 4.14))
+  (ppx_yojson_conv :with-dev-setup)))
 
 (package
  (name ocaml-lsp-server)
@@ -69,7 +70,8 @@ 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.2) (< 6.0)))))
+  (merlin-lib (and (>= 5.2) (< 6.0)))
+  (ppx_yojson_conv :with-dev-setup)))
 
 (package
  (name jsonrpc)

lsp.opam

@@ -32,6 +32,7 @@ depends: [
   "uutf" {>= "1.0.2"}
   "odoc" {with-doc}
   "ocaml" {>= "4.14"}
+  "ppx_yojson_conv" {with-dev-setup}
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [

ocaml-lsp-server.opam

@@ -46,6 +46,7 @@ depends: [
   "ocamlformat-rpc-lib" {>= "0.21.0"}
   "odoc" {with-doc}
   "merlin-lib" {>= "5.2" & < "6.0"}
+  "ppx_yojson_conv" {with-dev-setup}
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [