Merge pull request #6268 from rjbou/cli24

Add cli version for 2.4
ocaml · Oct 25, 2024 · 2a57765 · 2a57765
2 parents 0dcd3ea + ab1bdb9
commit 2a57765
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/master_changes.md b/master_changes.md
@@ -14,6 +14,7 @@ users)
   * Bump the version of opam to 2.4.0~alpha1~dev [#6204 @kit-ty-kate]
 
 ## Global CLI
+  * Add cli version 2.4 [#6268 @mbarbin @rjbou]
 
 ## Plugins
 

diff --git a/src/client/opamArg.mli b/src/client/opamArg.mli
@@ -25,6 +25,7 @@ val cli2_0: OpamCLIVersion.t
 val cli2_1: OpamCLIVersion.t
 val cli2_2: OpamCLIVersion.t
 val cli2_3: OpamCLIVersion.t
+val cli2_4: OpamCLIVersion.t
 
 (* [cli_from ?platform ?experimental since] validity flag since [since], and no
    removal version. If [experimental] is true, it is marked as is (warning and

diff --git a/src/client/opamArgTools.ml b/src/client/opamArgTools.ml
@@ -16,6 +16,7 @@ let cli2_0 = OpamCLIVersion.of_string "2.0"
 let cli2_1 = OpamCLIVersion.of_string "2.1"
 let cli2_2 = OpamCLIVersion.of_string "2.2"
 let cli2_3 = OpamCLIVersion.of_string "2.3"
+let cli2_4 = OpamCLIVersion.of_string "2.4"
 
 type subplatform = [ `windows | `unix ]
 type platform = [ `all | subplatform ]

diff --git a/src/client/opamArgTools.mli b/src/client/opamArgTools.mli
@@ -29,6 +29,7 @@ val cli2_0: OpamCLIVersion.t
 val cli2_1: OpamCLIVersion.t
 val cli2_2: OpamCLIVersion.t
 val cli2_3: OpamCLIVersion.t
+val cli2_4: OpamCLIVersion.t
 
 val mk_flag:
   cli:OpamCLIVersion.Sourced.t -> validity -> section:string -> string list ->

diff --git a/src/client/opamCLIVersion.ml b/src/client/opamCLIVersion.ml
@@ -10,7 +10,7 @@
 
 type t = int * int
 
-let supported_versions = [(2, 0); (2, 1); (2,2); (2,3)]
+let supported_versions = [(2, 0); (2, 1); (2,2); (2,3); (2,4)]
 
 let is_supported v = List.mem v supported_versions