diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e85ad04b4..f9e099793 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,8 @@ jobs: build: strategy: matrix: - ocaml: [4.14.x] - os: [macOS-latest, ubuntu-latest] + ocaml: [4.14.x, 4.13.x, 4.12.x] + os: [ubuntu-latest] fail-fast: false runs-on: ${{ matrix.os }} @@ -41,6 +41,26 @@ jobs: - name: 🧱 Build coq-lsp run: opam exec -- make build + osx: + runs-on: macOS-latest + steps: + - name: 🔭 Checkout code + uses: actions/checkout@v3 + with: + submodules: recursive + + - name: 🐫 Setup OCaml + uses: ocaml/setup-ocaml@v2 + with: + ocaml-compiler: 4.14.x + dune-cache: true + + - name: 🐫🐪🐫 Get dependencies + run: opam exec -- make opam-deps + + - name: 🧱 Build coq-lsp + run: opam exec -- make build + client-compile: runs-on: ubuntu-latest defaults: diff --git a/CHANGES.md b/CHANGES.md index fb433498f..ae6950b2b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ - Use LSP functions for client-side logging (@ejgallego , #87) - Log `_CoqProject` detection settings to client window (@ejgallego, #88) - Use plugin include paths from `_CoqProject` (@ejgallego, #88) + - Support OCaml >= 4.12 (@ejgallego, #93) # coq-lsp 0.1.0: Memory ----------------------- diff --git a/coq-lsp.opam b/coq-lsp.opam index a61ae3f0d..4bee93a02 100644 --- a/coq-lsp.opam +++ b/coq-lsp.opam @@ -15,8 +15,8 @@ license: "LGPL-2.1-or-later" doc: "https://coq.github.io/coq-lsp/" depends: [ - "ocaml" { >= "4.13.1" } - "dune" { build & >= "3.0.2" & < "3.4" } + "ocaml" { >= "4.12.0" } + "dune" { build & >= "3.5.0" } # Not yet required, install Coq deps instead # "coq" { >= "8.17" } @@ -26,13 +26,13 @@ depends: [ "zarith" {>= "1.11"} # serapi deps - "sexplib" { >= "v0.13.0" } - "ppx_deriving" { >= "4.2.1" } - "ppx_sexp_conv" { >= "v0.13.0" & < "v0.16" } - "ppx_compare" { >= "v0.13.0" & < "v0.16" } - "ppx_hash" { >= "v0.13.0" & < "v0.16" } - "ppx_import" { build & >= "1.5-3" } - "ppx_deriving_yojson" { >= "3.4" } + "sexplib" { >= "v0.13.0" } + "ppx_deriving" { >= "4.2.1" } + "ppx_sexp_conv" { >= "v0.13.0" } + "ppx_compare" { >= "v0.13.0" } + "ppx_hash" { >= "v0.13.0" } + "ppx_import" { build & >= "1.5-3" } + "ppx_deriving_yojson" { >= "3.4" } # lsp dependencies "cmdliner" { >= "1.1.0" } diff --git a/dune-project b/dune-project index 68da3def7..7bf79ee82 100644 --- a/dune-project +++ b/dune-project @@ -1,3 +1,5 @@ -(lang dune 2.5) +(lang dune 3.2) +; Can't bump to dune > 3.2 due to https://github.com/ocaml/dune/issues/6644 + (name coq-lsp)