Merge pull request ocaml#1856 from xvw/fix-1852-packaging-issues

Fix 1852 packaging issues
voodoos · Oct 8, 2024 · c639d4f · c639d4f
2 parents d6068a4 + c3dba72
commit c639d4f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,3 +1,4 @@
 (test
  (name sherlodoc_test)
+ (package merlin-lib)
  (libraries fmt alcotest merlin-lib.sherlodoc))