diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a49865f..ae21ec69 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: uses: avsm/setup-ocaml@v1 with: # Version of the OCaml compiler to initialise - ocaml-version: 4.12.0 + ocaml-version: 4.11.0 - name: Install dependencies run: | diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 27c7e0b1..23fed0ab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -92,6 +92,9 @@ You can look at the [online OCaml documentation](https://catala-lang.org/ocaml_docs/) for the different modules' interfaces as well as high-level architecture documentation. +Please note that the `ocamlformat` version the this project use is `0.17.0`. +Using another version may cause spurious diffs to appear in your pull requests. + ## Internationalization The Catala language should be adapted to any legislative text that follows a diff --git a/Makefile b/Makefile index fdabf5ba..e810a5fc 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ dependencies-ocaml: ocamlformat ANSITerminal sedlex menhir menhirLib dune cmdliner obelisk \ re obelisk unionfind bindlib zarith zarith_stubs_js ocamlgraph \ js_of_ocaml-compiler js_of_ocaml js_of_ocaml-ppx calendar camomile \ - visitors benchmark ocamlformat=0.17.0 + visitors benchmark ocamlformat init-submodules: git submodule update --init