[OCaml] Generate .ocamlformat file

sir4ur0n · sir4ur0n · commit 20c86dcaf65b · 2025-08-25T14:53:06.000+02:00
Fixes #21806
diff --git a/.github/workflows/samples-ocaml.yaml b/.github/workflows/samples-ocaml.yaml
@@ -35,3 +35,6 @@ jobs:
       - name: Build
         run: opam exec -- dune build
         working-directory: ${{ matrix.sample }}
+      - name: Check formatting
+        run: opam exec -- dune fmt
+        working-directory: ${{ matrix.sample }}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java
@@ -134,6 +134,7 @@ public OCamlClientCodegen() {
         supportingFiles.add(new SupportingFile("dune.mustache", "", "dune"));
         supportingFiles.add(new SupportingFile("dune-project.mustache", "", "dune-project"));
         supportingFiles.add(new SupportingFile("readme.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("ocamlformat.mustache", "", ".ocamlformat"));
 
         defaultIncludes = new HashSet<>(
                 Arrays.asList(
diff --git a/modules/openapi-generator/src/main/resources/ocaml/dune-project.mustache b/modules/openapi-generator/src/main/resources/ocaml/dune-project.mustache
@@ -1,2 +1,2 @@
-(lang dune 1.10)
-(name {{{packageName}}})
+(lang dune 2.0)
+(name {{{packageName}}})
diff --git a/modules/openapi-generator/src/main/resources/ocaml/lib.mustache b/modules/openapi-generator/src/main/resources/ocaml/lib.mustache
@@ -14,6 +14,7 @@ dev-repo: ""
 depends: [
   "ocaml"
   "ocamlfind"
+  "ocamlformat" {= "0.27.0"}
   "dune"
   "ppx_deriving_yojson"
   "conf-libev"
diff --git a/modules/openapi-generator/src/main/resources/ocaml/ocamlformat.mustache b/modules/openapi-generator/src/main/resources/ocaml/ocamlformat.mustache
@@ -0,0 +1,2 @@
+version=0.27.0
+ocaml-version=4.14.0
diff --git a/samples/client/petstore/ocaml-fake-petstore/.ocamlformat b/samples/client/petstore/ocaml-fake-petstore/.ocamlformat
@@ -0,0 +1,2 @@
+version=0.27.0
+ocaml-version=4.14.0
diff --git a/samples/client/petstore/ocaml-fake-petstore/.openapi-generator/FILES b/samples/client/petstore/ocaml-fake-petstore/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.ocamlformat
 README.md
 dune
 dune-project
diff --git a/samples/client/petstore/ocaml-fake-petstore/dune-project b/samples/client/petstore/ocaml-fake-petstore/dune-project
@@ -1,2 +1,2 @@
-(lang dune 1.10)
-(name petstore_client)
+(lang dune 2.0)
+(name petstore_client)
diff --git a/samples/client/petstore/ocaml-fake-petstore/petstore_client.opam b/samples/client/petstore/ocaml-fake-petstore/petstore_client.opam
@@ -14,6 +14,7 @@ dev-repo: ""
 depends: [
   "ocaml"
   "ocamlfind"
+  "ocamlformat" {= "0.27.0"}
   "dune"
   "ppx_deriving_yojson"
   "conf-libev"
diff --git a/samples/client/petstore/ocaml-oneOf/.ocamlformat b/samples/client/petstore/ocaml-oneOf/.ocamlformat
@@ -0,0 +1,2 @@
+version=0.27.0
+ocaml-version=4.14.0
diff --git a/samples/client/petstore/ocaml-oneOf/.openapi-generator/FILES b/samples/client/petstore/ocaml-oneOf/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.ocamlformat
 README.md
 dune
 dune-project
diff --git a/samples/client/petstore/ocaml-oneOf/dune-project b/samples/client/petstore/ocaml-oneOf/dune-project
@@ -1,2 +1,2 @@
-(lang dune 1.10)
-(name petstore_client)
+(lang dune 2.0)
+(name petstore_client)
diff --git a/samples/client/petstore/ocaml-oneOf/petstore_client.opam b/samples/client/petstore/ocaml-oneOf/petstore_client.opam
@@ -14,6 +14,7 @@ dev-repo: ""
 depends: [
   "ocaml"
   "ocamlfind"
+  "ocamlformat" {= "0.27.0"}
   "dune"
   "ppx_deriving_yojson"
   "conf-libev"
diff --git a/samples/client/petstore/ocaml/.ocamlformat b/samples/client/petstore/ocaml/.ocamlformat
@@ -0,0 +1,2 @@
+version=0.27.0
+ocaml-version=4.14.0
diff --git a/samples/client/petstore/ocaml/.openapi-generator/FILES b/samples/client/petstore/ocaml/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.ocamlformat
 README.md
 dune
 dune-project
diff --git a/samples/client/petstore/ocaml/dune-project b/samples/client/petstore/ocaml/dune-project
@@ -1,2 +1,2 @@
-(lang dune 1.10)
-(name petstore_client)
+(lang dune 2.0)
+(name petstore_client)
diff --git a/samples/client/petstore/ocaml/petstore_client.opam b/samples/client/petstore/ocaml/petstore_client.opam
@@ -14,6 +14,7 @@ dev-repo: ""
 depends: [
   "ocaml"
   "ocamlfind"
+  "ocamlformat" {= "0.27.0"}
   "dune"
   "ppx_deriving_yojson"
   "conf-libev"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+version=0.27.0`
	`2`	`+ocaml-version=4.14.0`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+.ocamlformat`
`1`	`2`	`README.md`
`2`	`3`	`dune`
`3`	`4`	`dune-project`