Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cli version for 2.4 #6268

Merged
merged 1 commit into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions src/client/opamArg.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/client/opamArgTools.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down
1 change: 1 addition & 0 deletions src/client/opamArgTools.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand Down
2 changes: 1 addition & 1 deletion src/client/opamCLIVersion.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading