Add Fedora 41, deprecate Fedora 39 (#221)

Author: MisterDA

CHANGES.md

@@ -2,6 +2,7 @@ unreleased
 ----------
 
 - Add Ubuntu 24.10. (@MisterDA, #222)
+- Add Fedora 41, deprecate Fedora 39. (@MisterDA, #221)
 
 v8.2.2 2024-07-31 Rochester
 ---------------------------

src-opam/distro.ml

@@ -63,7 +63,8 @@ type distro =
     | `V37
     | `V38
     | `V39
-    | `V40 ]
+    | `V40
+    | `V41 ]
   | `OracleLinux of [ `V7 | `V8 | `V9 ]
   | `OpenSUSE of
     [ `V42_1
@@ -151,6 +152,7 @@ type t =
     | `V38
     | `V39
     | `V40
+    | `V41
     | `Latest ]
   | `OracleLinux of [ `V7 | `V8 | `V9 | `Latest ]
   | `OpenSUSE of
@@ -283,6 +285,7 @@ let distros : t list =
     `Fedora `V38;
     `Fedora `V39;
     `Fedora `V40;
+    `Fedora `V41;
     `Fedora `Latest;
     `OracleLinux `V7;
     `OracleLinux `V8;
@@ -343,7 +346,7 @@ let resolve_alias (d : t) : distro =
   | `Alpine `Latest -> `Alpine `V3_20
   | `CentOS `Latest -> `CentOS `V7
   | `Debian `Stable -> `Debian `V12
-  | `Fedora `Latest -> `Fedora `V40
+  | `Fedora `Latest -> `Fedora `V41
   | `OracleLinux `Latest -> `OracleLinux `V9
   | `OpenSUSE `Latest -> `OpenSUSE `V15_6
   | `Ubuntu `Latest -> `Ubuntu `V24_10
@@ -360,7 +363,8 @@ let resolve_alias (d : t) : distro =
     | `Debian (`V7 | `V8 | `V9 | `V10 | `V11 | `V12 | `Testing | `Unstable)
     | `Fedora
         ( `V21 | `V22 | `V23 | `V24 | `V25 | `V26 | `V27 | `V28 | `V29 | `V30
-        | `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40 )
+        | `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40
+        | `V41 )
     | `OracleLinux (`V7 | `V8 | `V9)
     | `OpenSUSE
         ( `V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 | `V15_4
@@ -396,9 +400,9 @@ let distro_status (d : t) : status =
     | `Debian `Unstable -> `Active `Tier3
     | `Fedora
         ( `V21 | `V22 | `V23 | `V24 | `V25 | `V26 | `V27 | `V28 | `V29 | `V30
-        | `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 | `V38 ) ->
+        | `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 ) ->
         `Deprecated
-    | `Fedora (`V39 | `V40) -> `Active `Tier2
+    | `Fedora (`V40 | `V41) -> `Active `Tier2
     | `OracleLinux `V7 -> `Deprecated
     | `OracleLinux (`V8 | `V9) -> `Active `Tier3
     | `OpenSUSE
@@ -471,7 +475,7 @@ let distro_arches ov (d : t) =
     when OV.(compare Releases.v4_05_0 ov) = -1 ->
       let base = [ `X86_64; `Aarch64; `Ppc64le; `S390x ] in
       if OV.(compare Releases.v4_11_0 ov) <= 0 then `Riscv64 :: base else base
-  | `Fedora (`V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40), ov
+  | `Fedora (`V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40 | `V41), ov
     when OV.(compare Releases.v4_08_0 ov) = -1 ->
       [ `X86_64; `Aarch64 ]
   | `OpenSUSE (`V15_4 | `V15_5 | `V15_6), ov
@@ -593,6 +597,7 @@ let builtin_ocaml_of_distro (d : t) : string option =
   | `Fedora `V38 -> Some "4.14.0"
   | `Fedora `V39 -> Some "5.0.0"
   | `Fedora `V40 -> Some "5.1.1"
+  | `Fedora `V41 -> Some "5.2.0"
   | `CentOS `V6 -> Some "3.11.2"
   | `CentOS `V7 -> Some "4.01.0"
   | `CentOS `V8 -> Some "4.07.0"
@@ -676,6 +681,7 @@ let tag_of_distro (d : t) =
   | `Fedora `V38 -> "fedora-38"
   | `Fedora `V39 -> "fedora-39"
   | `Fedora `V40 -> "fedora-40"
+  | `Fedora `V41 -> "fedora-41"
   | `OracleLinux `V7 -> "oraclelinux-7"
   | `OracleLinux `V8 -> "oraclelinux-8"
   | `OracleLinux `V9 -> "oraclelinux-9"
@@ -783,6 +789,7 @@ let distro_of_tag x : t option =
   | "fedora-38" -> Some (`Fedora `V38)
   | "fedora-39" -> Some (`Fedora `V39)
   | "fedora-40" -> Some (`Fedora `V40)
+  | "fedora-41" -> Some (`Fedora `V41)
   | "fedora" -> Some (`Fedora `Latest)
   | "oraclelinux-7" -> Some (`OracleLinux `V7)
   | "oraclelinux-8" -> Some (`OracleLinux `V8)
@@ -891,6 +898,7 @@ let human_readable_string_of_distro (d : t) =
     | `Fedora `V38 -> "Fedora 38"
     | `Fedora `V39 -> "Fedora 39"
     | `Fedora `V40 -> "Fedora 40"
+    | `Fedora `V41 -> "Fedora 41"
     | `OracleLinux `V7 -> "OracleLinux 7"
     | `OracleLinux `V8 -> "OracleLinux 8"
     | `OracleLinux `V9 -> "OracleLinux 9"
@@ -1040,8 +1048,9 @@ let bubblewrap_version (t : t) =
   | `Fedora `V36 -> Some (0, 5, 0)
   | `Fedora `V37 -> Some (0, 5, 0)
   | `Fedora `V38 -> Some (0, 7, 0)
-  | `Fedora `V39 -> Some (0, 8, 0)
-  | `Fedora `V40 -> Some (0, 8, 0)
+  | `Fedora `V39 -> Some (0, 10, 0)
+  | `Fedora `V40 -> Some (0, 10, 0)
+  | `Fedora `V41 -> Some (0, 10, 0)
   | `OracleLinux `V7 -> None
   | `OracleLinux `V8 -> Some (0, 4, 0)
   | `OracleLinux `V9 -> Some (0, 4, 1)
@@ -1176,6 +1185,7 @@ let base_distro_tag ?(arch = `X86_64) d =
         | `V38 -> "38"
         | `V39 -> "39"
         | `V40 -> "40"
+        | `V41 -> "41"
       in
       ("fedora", tag)
   | `OracleLinux v ->

src-opam/distro.mli

@@ -65,7 +65,8 @@ type distro =
     | `V37
     | `V38
     | `V39
-    | `V40 ]
+    | `V40
+    | `V41 ]
   | `OracleLinux of [ `V7 | `V8 | `V9 ]
   | `OpenSUSE of
     [ `V42_1
@@ -153,6 +154,7 @@ type t =
     | `V38
     | `V39
     | `V40
+    | `V41
     | `Latest ]
   | `OracleLinux of [ `V7 | `V8 | `V9 | `Latest ]
   | `OpenSUSE of