Bump opam-root-version to 2.2

ocaml · May 29, 2024 · c1a006c · c1a006c
1 parent 21305bb
commit c1a006c
Show file tree

Hide file tree

Showing 5 changed files with 388 additions and 25 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -14,6 +14,7 @@ users)
   * Bump version to 2.2.0~beta3~dev [#5917 @kit-ty-kate]
   * Bump the version number after the release of 2.2.0~beta1 [#5785 @kit-ty-kate]
   * Upgrade the opam-root-version to 2.2~beta [#5904 @kit-ty-kate]
+  * Bump opam-root-version to 2.2 [#5980 @kit-ty-kate]
 
 ## Global CLI
   * Fix a typo in the variable description returned by "opam var" [#5961 @jmid]

diff --git a/release/readme.md b/release/readme.md
@@ -1,9 +1,10 @@
 # Steps to follow for each release
 
 ## Finalise opam code for release
-* update version in opam files, configure.ac
+* update version in all the opam files and in configure.ac
 * run `make configure` to regenerate `./configure` [checked by github actions]
 * update copyright headers
+* if you're releasing the first final release of a new branch (e.g. 2.2.0): make sure `root_version` in OpamFile.ml is set to the final release number (e.g. for 2.2.0, root_version should be 2.2). Make sure that opamFormatUpgrade.ml also contains an upgrade function from the previous version (that function will most likely be empty)
 * run `make tests`, `opam-rt` [checked by github actions]
 * update the CHANGE file: take `master_changes.md` content to fill it
 

diff --git a/src/format/opamFile.ml b/src/format/opamFile.ml
@@ -1395,7 +1395,7 @@ module ConfigSyntax = struct
   let atomic = false
   let format_version = OpamVersion.of_string "2.1"
   let file_format_version = OpamVersion.of_string "2.0"
-  let root_version = OpamVersion.of_string "2.2~beta"
+  let root_version = OpamVersion.of_string "2.2"
 
   let default_old_root_version = OpamVersion.of_string "2.1~~previous"
 

diff --git a/src/state/opamFormatUpgrade.ml b/src/state/opamFormatUpgrade.ml
@@ -1143,6 +1143,10 @@ let from_2_2_alpha_to_2_2_beta ~on_the_fly _ conf =
    | None -> info_jobs_changed ~prev_jobs:1);
   OpamFile.Config.with_jobs_opt None conf, gtc_none
 
+let v2_2 = OpamVersion.of_string "2.2"
+
+let from_2_2_beta_to_2_2 ~on_the_fly:_ _ conf = conf, gtc_none
+
 (* To add an upgrade layer
    * If it is a light upgrade, returns as second element if the repo or switch
      need an light upgrade with `gtc_*` values.
@@ -1239,6 +1243,7 @@ let as_necessary ?reinit requested_lock global_lock root config =
      ]) @ [
       v2_2_alpha,  from_2_1_to_2_2_alpha;
       v2_2_beta,   from_2_2_alpha_to_2_2_beta;
+      v2_2,        from_2_2_beta_to_2_2;
     ]
     |> List.filter (fun (v,_) ->
         OpamVersion.compare root_version v < 0)