Merge pull request #28542 from jmid/dune-3-12-1-bound

raphael-proust · web-flow · commit ac8717cc1db4 · 2025-09-19T10:17:49.000+02:00
OCaml 5.3 and dune.3.12.1 conflict too
diff --git a/packages/dune/dune.3.12.1/opam b/packages/dune/dune.3.12.1/opam
@@ -42,7 +42,7 @@ build: [
 depends: [
   # Please keep the lower bound in sync with .github/workflows/workflow.yml,
   # dune-project and min_ocaml_version in bootstrap.ml
-  ("ocaml" {>= "4.08" & < "5.4"} | ("ocaml" {>= "4.02" & < "4.08~~"} & "ocamlfind-secondary"))
+  ("ocaml" {>= "4.08" & < "5.3"} | ("ocaml" {>= "4.02" & < "4.08~~"} & "ocamlfind-secondary"))
   "base-unix"
   "base-threads"
 ]

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ build: [`
`42`	`42`	`depends: [`
`43`	`43`	`# Please keep the lower bound in sync with .github/workflows/workflow.yml,`
`44`	`44`	`# dune-project and min_ocaml_version in bootstrap.ml`
`45`		`- ("ocaml" {>= "4.08" & < "5.4"} \| ("ocaml" {>= "4.02" & < "4.08~~"} & "ocamlfind-secondary"))`
	`45`	`+ ("ocaml" {>= "4.08" & < "5.3"} \| ("ocaml" {>= "4.02" & < "4.08~~"} & "ocamlfind-secondary"))`
`46`	`46`	`"base-unix"`
`47`	`47`	`"base-threads"`
`48`	`48`	`]`