Merge pull request #146 from mbarbin/cmdliner-2.0-compat

mbarbin · web-flow · commit 3922f41b2c9a · 2026-03-26T11:59:54.000+01:00
OCaml 5.4 CI &amp; cmdliner 2.0 compat
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
         os:
           - ubuntu-latest
         ocaml-version:
-          - "5.3"
+          - "5.4"
 
     runs-on: ${{ matrix.os }}
 
diff --git a/.github/workflows/deploy-doc.yml b/.github/workflows/deploy-doc.yml
@@ -15,7 +15,7 @@ jobs:
     name: Build Docusaurus
     runs-on: ubuntu-latest
     env:
-      OCAML_VERSION: "5.3"
+      OCAML_VERSION: "5.4"
     defaults:
       run:
         shell: bash
diff --git a/.github/workflows/dune-pkg-more-ci.yml b/.github/workflows/dune-pkg-more-ci.yml
@@ -25,13 +25,14 @@ jobs:
           - ubuntu-latest
           - macos-latest
         ocaml-version:
+          - "5.4"
           - "5.3"
           - "5.2"
           - "4.14"
         exclude:
           # Exclude the combination already tested in the main ci workflow.
           - os: ubuntu-latest
-            ocaml-version: "5.3"
+            ocaml-version: "5.4"
 
     runs-on: ${{ matrix.os }}
 
diff --git a/.github/workflows/test-deploy-doc.yml b/.github/workflows/test-deploy-doc.yml
@@ -15,7 +15,7 @@ jobs:
     name: Test deployment
     runs-on: ubuntu-latest
     env:
-      OCAML_VERSION: "5.3"
+      OCAML_VERSION: "5.4"
     defaults:
       run:
         shell: bash
diff --git a/dune-project b/dune-project
@@ -297,19 +297,15 @@
  (synopsis "Tests & Examples for volgo")
  (depends
   (ocaml
-   (and
-    (>= 5.2)
-    (< 5.4~)))
+   (>= 5.2))
   (bitv
    (>= 2.1))
   (cmdlang
    (>= 0.0.9))
   (cmdlang-cmdliner-err-runner
    (>= 0.0.16))
   (cmdliner
-   (and
-    (>= 1.3.0)
-    (< 2.0)))
+   (>= 1.3.0))
   conf-git
   conf-hg
   (eio
@@ -393,17 +389,13 @@
  (allow_empty)
  (depends
   (ocaml
-   (and
-    (>= 5.3)
-    (< 5.4~)))
+   (>= 5.3))
   (ocamlformat
    (= 0.29.0))
   (bisect_ppx
    (>= 2.8.3))
   (cmdliner
-   (and
-    (>= 1.3.0)
-    (< 2.0)))
+   (>= 1.3.0))
   conf-git
   conf-hg
   (mdx
diff --git a/dune-workspace-5.4 b/dune-workspace-5.4
@@ -0,0 +1,17 @@
+(lang dune 3.20)
+
+(pkg enabled)
+
+(lock_dir
+ (repositories overlay upstream alpha mbarbin)
+ (constraints
+  (ocaml
+   (= 5.4.1))))
+
+(repository
+ (name mbarbin)
+ (url "git+https://github.com/mbarbin/opam-repository.git"))
+
+(repository
+ (name alpha)
+ (url "git+https://github.com/kit-ty-kate/opam-alpha-repository.git"))
diff --git a/volgo-dev.opam b/volgo-dev.opam
@@ -9,10 +9,10 @@ doc: "https://mbarbin.github.io/vcs/"
 bug-reports: "https://github.com/mbarbin/vcs/issues"
 depends: [
   "dune" {>= "3.17"}
-  "ocaml" {>= "5.3" & < "5.4~"}
+  "ocaml" {>= "5.3"}
   "ocamlformat" {= "0.29.0"}
   "bisect_ppx" {>= "2.8.3"}
-  "cmdliner" {>= "1.3.0" & < "2.0"}
+  "cmdliner" {>= "1.3.0"}
   "conf-git"
   "conf-hg"
   "mdx" {>= "2.4"}
diff --git a/volgo-tests.opam b/volgo-tests.opam
@@ -9,11 +9,11 @@ doc: "https://mbarbin.github.io/vcs/"
 bug-reports: "https://github.com/mbarbin/vcs/issues"
 depends: [
   "dune" {>= "3.17"}
-  "ocaml" {>= "5.2" & < "5.4~"}
+  "ocaml" {>= "5.2"}
   "bitv" {>= "2.1"}
   "cmdlang" {>= "0.0.9"}
   "cmdlang-cmdliner-err-runner" {>= "0.0.16"}
-  "cmdliner" {>= "1.3.0" & < "2.0"}
+  "cmdliner" {>= "1.3.0"}
   "conf-git"
   "conf-hg"
   "eio" {>= "1.0"}
