Merge pull request #136 from mbarbin/ocaml-5.4-in-ci

mbarbin · web-flow · commit 26f5fde7101d · 2025-11-04T22:53:55.000+01:00
Enable OCaml 5.4 in CI
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
         os:
           - ubuntu-latest
         ocaml-compiler:
-          - 5.3.x
+          - 5.4.x
 
     runs-on: ${{ matrix.os }}
 
@@ -32,7 +32,7 @@ jobs:
           opam-repositories: |
             default: https://github.com/ocaml/opam-repository.git
             mbarbin: https://github.com/mbarbin/opam-repository.git
-      #     alpha:   https://github.com/kit-ty-kate/opam-alpha-repository.git
+            alpha:   https://github.com/kit-ty-kate/opam-alpha-repository.git
       #     janestreet-bleeding: https://github.com/janestreet/opam-repository.git
       #     janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
 
diff --git a/.github/workflows/deploy-doc.yml b/.github/workflows/deploy-doc.yml
@@ -34,12 +34,12 @@ jobs:
       - name: Setup OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: "5.3.x"
+          ocaml-compiler: "5.4.x"
           dune-cache: true
           opam-repositories: |
             default: https://github.com/ocaml/opam-repository.git
             mbarbin: https://github.com/mbarbin/opam-repository.git
-      #     alpha:   https://github.com/kit-ty-kate/opam-alpha-repository.git
+            alpha:   https://github.com/kit-ty-kate/opam-alpha-repository.git
       #     janestreet-bleeding: https://github.com/janestreet/opam-repository.git
       #     janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
 
diff --git a/.github/workflows/more-ci.yml b/.github/workflows/more-ci.yml
@@ -28,11 +28,12 @@ jobs:
           - macos-latest
           - ubuntu-latest
         ocaml-compiler:
+          - 5.4.x
           - 5.3.x
         exclude:
           # We exclude the combination already tested in the 'ci' workflow.
           - os: ubuntu-latest
-            ocaml-compiler: 5.3.x
+            ocaml-compiler: 5.4.x
 
     runs-on: ${{ matrix.os }}
 
@@ -48,7 +49,7 @@ jobs:
           opam-repositories: |
             default: https://github.com/ocaml/opam-repository.git
             mbarbin: https://github.com/mbarbin/opam-repository.git
-      #     alpha:   https://github.com/kit-ty-kate/opam-alpha-repository.git
+            alpha:   https://github.com/kit-ty-kate/opam-alpha-repository.git
       #     janestreet-bleeding: https://github.com/janestreet/opam-repository.git
       #     janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
 
diff --git a/.github/workflows/test-deploy-doc.yml b/.github/workflows/test-deploy-doc.yml
@@ -34,12 +34,12 @@ jobs:
       - name: Setup OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: "5.3.x"
+          ocaml-compiler: "5.4.x"
           dune-cache: true
           opam-repositories: |
             default: https://github.com/ocaml/opam-repository.git
             mbarbin: https://github.com/mbarbin/opam-repository.git
-      #     alpha:   https://github.com/kit-ty-kate/opam-alpha-repository.git
+            alpha:   https://github.com/kit-ty-kate/opam-alpha-repository.git
       #     janestreet-bleeding: https://github.com/janestreet/opam-repository.git
       #     janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
 
diff --git a/dune-project b/dune-project
@@ -155,9 +155,7 @@
  (synopsis "Tests for dunolint")
  (depends
   (ocaml
-   (and
-    (>= 5.3)
-    (< 5.4~)))
+   (>= 5.3))
   (dune
    (>= 3.20))
   (base
@@ -256,9 +254,7 @@
  (allow_empty) ; The package is attached to stanza in doc/ however dune doesn't see it.
  (depends
   (ocaml
-   (and
-    (>= 5.3)
-    (< 5.4~)))
+   (>= 5.3))
   (dune
    (>= 3.20))
   (ocamlformat
diff --git a/dunolint-dev.opam b/dunolint-dev.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/mbarbin/dunolint"
 doc: "https://mbarbin.github.io/dunolint/"
 bug-reports: "https://github.com/mbarbin/dunolint/issues"
 depends: [
-  "ocaml" {>= "5.3" & < "5.4~"}
+  "ocaml" {>= "5.3"}
   "dune" {>= "3.17" & >= "3.20"}
   "ocamlformat" {= "0.28.1"}
   "base" {>= "v0.17"}
diff --git a/dunolint-tests.opam b/dunolint-tests.opam
@@ -8,7 +8,7 @@ homepage: "https://github.com/mbarbin/dunolint"
 doc: "https://mbarbin.github.io/dunolint/"
 bug-reports: "https://github.com/mbarbin/dunolint/issues"
 depends: [
-  "ocaml" {>= "5.3" & < "5.4~"}
+  "ocaml" {>= "5.3"}
   "dune" {>= "3.17" & >= "3.20"}
   "base" {>= "v0.17"}
   "cmdlang" {>= "0.0.9"}
diff --git a/lib/dunolint_engine/src/running_mode.ml b/lib/dunolint_engine/src/running_mode.ml
@@ -19,12 +19,18 @@
 (*  <http://www.gnu.org/licenses/> and <https://spdx.org>, respectively.         *)
 (*********************************************************************************)
 
-type t =
-  | Dry_run
-  | Check
-  | Force_yes
-  | Interactive
-[@@deriving compare, equal, sexp_of]
+module T = struct
+  [@@@coverage off]
+
+  type t =
+    | Dry_run
+    | Check
+    | Force_yes
+    | Interactive
+  [@@deriving compare, equal, sexp_of]
+end
+
+include T
 
 let default = Interactive
 
