Skip to content

Commit 5020ab9

Browse files
MisterDAMisterDA
authored
Add Fedora 41, deprecate Fedora 39 (#221)
1 parent ab4b839 commit 5020ab9

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

‎CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ unreleased
22
----------
33

44
- Add Ubuntu 24.10. (@MisterDA, #222)
5+
- Add Fedora 41, deprecate Fedora 39. (@MisterDA, #221)
56

67
v8.2.2 2024-07-31 Rochester
78
---------------------------

‎src-opam/distro.ml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ type distro =
6363
| `V37
6464
| `V38
6565
| `V39
66-
| `V40 ]
66+
| `V40
67+
| `V41 ]
6768
| `OracleLinux of [ `V7 | `V8 | `V9 ]
6869
| `OpenSUSE of
6970
[ `V42_1
@@ -151,6 +152,7 @@ type t =
151152
| `V38
152153
| `V39
153154
| `V40
155+
| `V41
154156
| `Latest ]
155157
| `OracleLinux of [ `V7 | `V8 | `V9 | `Latest ]
156158
| `OpenSUSE of
@@ -283,6 +285,7 @@ let distros : t list =
283285
`Fedora `V38;
284286
`Fedora `V39;
285287
`Fedora `V40;
288+
`Fedora `V41;
286289
`Fedora `Latest;
287290
`OracleLinux `V7;
288291
`OracleLinux `V8;
@@ -343,7 +346,7 @@ let resolve_alias (d : t) : distro =
343346
| `Alpine `Latest -> `Alpine `V3_20
344347
| `CentOS `Latest -> `CentOS `V7
345348
| `Debian `Stable -> `Debian `V12
346-
| `Fedora `Latest -> `Fedora `V40
349+
| `Fedora `Latest -> `Fedora `V41
347350
| `OracleLinux `Latest -> `OracleLinux `V9
348351
| `OpenSUSE `Latest -> `OpenSUSE `V15_6
349352
| `Ubuntu `Latest -> `Ubuntu `V24_10
@@ -360,7 +363,8 @@ let resolve_alias (d : t) : distro =
360363
| `Debian (`V7 | `V8 | `V9 | `V10 | `V11 | `V12 | `Testing | `Unstable)
361364
| `Fedora
362365
( `V21 | `V22 | `V23 | `V24 | `V25 | `V26 | `V27 | `V28 | `V29 | `V30
363-
| `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40 )
366+
| `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40
367+
| `V41 )
364368
| `OracleLinux (`V7 | `V8 | `V9)
365369
| `OpenSUSE
366370
( `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 =
396400
| `Debian `Unstable -> `Active `Tier3
397401
| `Fedora
398402
( `V21 | `V22 | `V23 | `V24 | `V25 | `V26 | `V27 | `V28 | `V29 | `V30
399-
| `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 | `V38 ) ->
403+
| `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 ) ->
400404
`Deprecated
401-
| `Fedora (`V39 | `V40) -> `Active `Tier2
405+
| `Fedora (`V40 | `V41) -> `Active `Tier2
402406
| `OracleLinux `V7 -> `Deprecated
403407
| `OracleLinux (`V8 | `V9) -> `Active `Tier3
404408
| `OpenSUSE
@@ -471,7 +475,7 @@ let distro_arches ov (d : t) =
471475
when OV.(compare Releases.v4_05_0 ov) = -1 ->
472476
let base = [ `X86_64; `Aarch64; `Ppc64le; `S390x ] in
473477
if OV.(compare Releases.v4_11_0 ov) <= 0 then `Riscv64 :: base else base
474-
| `Fedora (`V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40), ov
478+
| `Fedora (`V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40 | `V41), ov
475479
when OV.(compare Releases.v4_08_0 ov) = -1 ->
476480
[ `X86_64; `Aarch64 ]
477481
| `OpenSUSE (`V15_4 | `V15_5 | `V15_6), ov
@@ -593,6 +597,7 @@ let builtin_ocaml_of_distro (d : t) : string option =
593597
| `Fedora `V38 -> Some "4.14.0"
594598
| `Fedora `V39 -> Some "5.0.0"
595599
| `Fedora `V40 -> Some "5.1.1"
600+
| `Fedora `V41 -> Some "5.2.0"
596601
| `CentOS `V6 -> Some "3.11.2"
597602
| `CentOS `V7 -> Some "4.01.0"
598603
| `CentOS `V8 -> Some "4.07.0"
@@ -676,6 +681,7 @@ let tag_of_distro (d : t) =
676681
| `Fedora `V38 -> "fedora-38"
677682
| `Fedora `V39 -> "fedora-39"
678683
| `Fedora `V40 -> "fedora-40"
684+
| `Fedora `V41 -> "fedora-41"
679685
| `OracleLinux `V7 -> "oraclelinux-7"
680686
| `OracleLinux `V8 -> "oraclelinux-8"
681687
| `OracleLinux `V9 -> "oraclelinux-9"
@@ -783,6 +789,7 @@ let distro_of_tag x : t option =
783789
| "fedora-38" -> Some (`Fedora `V38)
784790
| "fedora-39" -> Some (`Fedora `V39)
785791
| "fedora-40" -> Some (`Fedora `V40)
792+
| "fedora-41" -> Some (`Fedora `V41)
786793
| "fedora" -> Some (`Fedora `Latest)
787794
| "oraclelinux-7" -> Some (`OracleLinux `V7)
788795
| "oraclelinux-8" -> Some (`OracleLinux `V8)
@@ -891,6 +898,7 @@ let human_readable_string_of_distro (d : t) =
891898
| `Fedora `V38 -> "Fedora 38"
892899
| `Fedora `V39 -> "Fedora 39"
893900
| `Fedora `V40 -> "Fedora 40"
901+
| `Fedora `V41 -> "Fedora 41"
894902
| `OracleLinux `V7 -> "OracleLinux 7"
895903
| `OracleLinux `V8 -> "OracleLinux 8"
896904
| `OracleLinux `V9 -> "OracleLinux 9"
@@ -1040,8 +1048,9 @@ let bubblewrap_version (t : t) =
10401048
| `Fedora `V36 -> Some (0, 5, 0)
10411049
| `Fedora `V37 -> Some (0, 5, 0)
10421050
| `Fedora `V38 -> Some (0, 7, 0)
1043-
| `Fedora `V39 -> Some (0, 8, 0)
1044-
| `Fedora `V40 -> Some (0, 8, 0)
1051+
| `Fedora `V39 -> Some (0, 10, 0)
1052+
| `Fedora `V40 -> Some (0, 10, 0)
1053+
| `Fedora `V41 -> Some (0, 10, 0)
10451054
| `OracleLinux `V7 -> None
10461055
| `OracleLinux `V8 -> Some (0, 4, 0)
10471056
| `OracleLinux `V9 -> Some (0, 4, 1)
@@ -1176,6 +1185,7 @@ let base_distro_tag ?(arch = `X86_64) d =
11761185
| `V38 -> "38"
11771186
| `V39 -> "39"
11781187
| `V40 -> "40"
1188+
| `V41 -> "41"
11791189
in
11801190
("fedora", tag)
11811191
| `OracleLinux v ->

‎src-opam/distro.mli

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ type distro =
6565
| `V37
6666
| `V38
6767
| `V39
68-
| `V40 ]
68+
| `V40
69+
| `V41 ]
6970
| `OracleLinux of [ `V7 | `V8 | `V9 ]
7071
| `OpenSUSE of
7172
[ `V42_1
@@ -153,6 +154,7 @@ type t =
153154
| `V38
154155
| `V39
155156
| `V40
157+
| `V41
156158
| `Latest ]
157159
| `OracleLinux of [ `V7 | `V8 | `V9 | `Latest ]
158160
| `OpenSUSE of

0 commit comments

Comments
 (0)