diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 069037fe19..3106730237 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -2,7 +2,7 @@ name: Changelog check on: pull_request: - branches: [ master ] + branches: [ main ] types: [ opened, synchronize, reopened, labeled, unlabeled ] jobs: diff --git a/dot-merlin-reader.opam b/dot-merlin-reader.opam index 3f243280fe..f6b25929d9 100644 --- a/dot-merlin-reader.opam +++ b/dot-merlin-reader.opam @@ -12,7 +12,7 @@ build: [ ] depends: [ "ocaml" {>= "5.2" } - "dune" {>= "2.9.0"} + "dune" {>= "3.0.0"} "merlin-lib" {>= "5.2"} "ocamlfind" {>= "1.6.0"} ] diff --git a/merlin-lib.opam b/merlin-lib.opam index 153285c7cb..6e6bde2545 100644 --- a/merlin-lib.opam +++ b/merlin-lib.opam @@ -13,7 +13,7 @@ depends: [ "ocaml" {>= "5.2" & < "5.3"} "dune" {>= "3.0.0"} "csexp" {>= "1.5.1"} - "alcotest" {with-test} + "alcotest" {with-test & >= "1.3.0" } "menhir" {dev & >= "20201216"} "menhirLib" {dev & >= "20201216"} "menhirSdk" {dev & >= "20201216"} diff --git a/tests/test-units/sherldoc/dune b/tests/test-units/sherldoc/dune index f84c9d6d2c..e6ebc33cfd 100644 --- a/tests/test-units/sherldoc/dune +++ b/tests/test-units/sherldoc/dune @@ -1,3 +1,4 @@ (test (name sherlodoc_test) + (package merlin-lib) (libraries fmt alcotest merlin-lib.sherlodoc))