From 602538aea52e0c981c30a1474a5536e82cc5e381 Mon Sep 17 00:00:00 2001 From: Mathieu Barbin Date: Mon, 6 Jan 2025 10:53:41 +0100 Subject: [PATCH 1/3] Enable ocamlformat parse-docstrings --- .ocamlformat | 1 + 1 file changed, 1 insertion(+) diff --git a/.ocamlformat b/.ocamlformat index 04d5660..e6fd08a 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -1,2 +1,3 @@ version=0.27.0 profile=janestreet +parse-docstrings=true From f0e2d384ab1264ddb302e9486bd3a6114bb1c488 Mon Sep 17 00:00:00 2001 From: Mathieu Barbin Date: Tue, 7 Jan 2025 10:44:14 +0100 Subject: [PATCH 2/3] Add ocaml-version to ocamlformat config according to the project lower bound --- .ocamlformat | 1 + 1 file changed, 1 insertion(+) diff --git a/.ocamlformat b/.ocamlformat index e6fd08a..3802be7 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -1,3 +1,4 @@ version=0.27.0 +ocaml-version=4.14 profile=janestreet parse-docstrings=true From 4f0422013bcc48451a6b4d15c68dc40b759229dc Mon Sep 17 00:00:00 2001 From: Mathieu Barbin Date: Thu, 9 Jan 2025 12:53:07 +0100 Subject: [PATCH 3/3] Use 5.3 in ci --- .github/workflows/ci.yml | 2 +- .github/workflows/more-ci.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9119e90..f4b05e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: os: - ubuntu-latest ocaml-compiler: - - 5.2.x + - 5.3.x runs-on: ${{ matrix.os }} diff --git a/.github/workflows/more-ci.yml b/.github/workflows/more-ci.yml index facf66d..d25bdf5 100644 --- a/.github/workflows/more-ci.yml +++ b/.github/workflows/more-ci.yml @@ -29,12 +29,13 @@ jobs: - ubuntu-latest - windows-latest ocaml-compiler: + - 5.3.x - 5.2.x - 4.14.x exclude: # We exclude the combination already tested in the 'ci' workflow. - os: ubuntu-latest - ocaml-compiler: 5.2.x + ocaml-compiler: 5.3.x # We exclude windows-4.14 - this fails when building core. - os: windows-latest ocaml-compiler: 4.14.x