Skip to content

Commit 72c2dc4

Browse files
mtelversmtelvers
authored
Merge pull request #228 from ocurrent/fedora-42
Add Fedora 42, deprecate Fedora 40
2 parents ede8e64 + d015e30 commit 72c2dc4

File tree

3 files changed

+28
-8
lines changed

3 files changed

+28
-8
lines changed

‎CHANGES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
unreleased
2+
----------
3+
4+
- Add Fedora 42, deprecate Fedora 40. (@MisterDA, #228)
5+
16
v8.2.5 2024-12-17 Lille
27
-----------------------
38

‎src-opam/distro.ml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ type distro =
6565
| `V38
6666
| `V39
6767
| `V40
68-
| `V41 ]
68+
| `V41
69+
| `V42 ]
6970
| `OracleLinux of [ `V7 | `V8 | `V9 ]
7071
| `OpenSUSE of
7172
[ `V42_1
@@ -155,6 +156,7 @@ type t =
155156
| `V39
156157
| `V40
157158
| `V41
159+
| `V42
158160
| `Latest ]
159161
| `OracleLinux of [ `V7 | `V8 | `V9 | `Latest ]
160162
| `OpenSUSE of
@@ -289,6 +291,7 @@ let distros : t list =
289291
`Fedora `V39;
290292
`Fedora `V40;
291293
`Fedora `V41;
294+
`Fedora `V42;
292295
`Fedora `Latest;
293296
`OracleLinux `V7;
294297
`OracleLinux `V8;
@@ -349,7 +352,7 @@ let resolve_alias (d : t) : distro =
349352
| `Alpine `Latest -> `Alpine `V3_21
350353
| `CentOS `Latest -> `CentOS `V7
351354
| `Debian `Stable -> `Debian `V12
352-
| `Fedora `Latest -> `Fedora `V41
355+
| `Fedora `Latest -> `Fedora `V42
353356
| `OracleLinux `Latest -> `OracleLinux `V9
354357
| `OpenSUSE `Latest -> `OpenSUSE `V15_6
355358
| `Ubuntu `Latest -> `Ubuntu `V24_10
@@ -367,7 +370,7 @@ let resolve_alias (d : t) : distro =
367370
| `Fedora
368371
( `V21 | `V22 | `V23 | `V24 | `V25 | `V26 | `V27 | `V28 | `V29 | `V30
369372
| `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40
370-
| `V41 )
373+
| `V41 | `V42 )
371374
| `OracleLinux (`V7 | `V8 | `V9)
372375
| `OpenSUSE
373376
( `V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 | `V15_4
@@ -403,9 +406,10 @@ let distro_status (d : t) : status =
403406
| `Debian `Unstable -> `Active `Tier3
404407
| `Fedora
405408
( `V21 | `V22 | `V23 | `V24 | `V25 | `V26 | `V27 | `V28 | `V29 | `V30
406-
| `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 ) ->
409+
| `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40 )
410+
->
407411
`Deprecated
408-
| `Fedora (`V40 | `V41) -> `Active `Tier2
412+
| `Fedora (`V41 | `V42) -> `Active `Tier2
409413
| `OracleLinux `V7 -> `Deprecated
410414
| `OracleLinux (`V8 | `V9) -> `Active `Tier3
411415
| `OpenSUSE
@@ -479,7 +483,9 @@ let distro_arches ov (d : t) =
479483
when OV.(compare Releases.v4_05_0 ov) = -1 ->
480484
let base = [ `X86_64; `Aarch64; `Ppc64le; `S390x ] in
481485
if OV.(compare Releases.v4_11_0 ov) <= 0 then `Riscv64 :: base else base
482-
| `Fedora (`V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40 | `V41), ov
486+
| ( `Fedora
487+
(`V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40 | `V41 | `V42),
488+
ov )
483489
when OV.(compare Releases.v4_08_0 ov) = -1 ->
484490
[ `X86_64; `Aarch64 ]
485491
| `OpenSUSE (`V15_4 | `V15_5 | `V15_6), ov
@@ -602,7 +608,8 @@ let builtin_ocaml_of_distro (d : t) : string option =
602608
| `Fedora `V38 -> Some "4.14.0"
603609
| `Fedora `V39 -> Some "5.0.0"
604610
| `Fedora `V40 -> Some "5.1.1"
605-
| `Fedora `V41 -> Some "5.2.0"
611+
| `Fedora `V41 -> Some "5.2.1"
612+
| `Fedora `V42 -> Some "5.3.0"
606613
| `CentOS `V6 -> Some "3.11.2"
607614
| `CentOS `V7 -> Some "4.01.0"
608615
| `CentOS `V8 -> Some "4.07.0"
@@ -687,6 +694,7 @@ let tag_of_distro (d : t) =
687694
| `Fedora `V39 -> "fedora-39"
688695
| `Fedora `V40 -> "fedora-40"
689696
| `Fedora `V41 -> "fedora-41"
697+
| `Fedora `V42 -> "fedora-42"
690698
| `OracleLinux `V7 -> "oraclelinux-7"
691699
| `OracleLinux `V8 -> "oraclelinux-8"
692700
| `OracleLinux `V9 -> "oraclelinux-9"
@@ -796,6 +804,7 @@ let distro_of_tag x : t option =
796804
| "fedora-39" -> Some (`Fedora `V39)
797805
| "fedora-40" -> Some (`Fedora `V40)
798806
| "fedora-41" -> Some (`Fedora `V41)
807+
| "fedora-42" -> Some (`Fedora `V42)
799808
| "fedora" -> Some (`Fedora `Latest)
800809
| "oraclelinux-7" -> Some (`OracleLinux `V7)
801810
| "oraclelinux-8" -> Some (`OracleLinux `V8)
@@ -819,6 +828,7 @@ let distro_of_tag x : t option =
819828
| "alpine-3.18" -> Some (`Alpine `V3_18)
820829
| "alpine-3.19" -> Some (`Alpine `V3_19)
821830
| "alpine-3.20" -> Some (`Alpine `V3_20)
831+
| "alpine-3.21" -> Some (`Alpine `V3_21)
822832
| "alpine" -> Some (`Alpine `Latest)
823833
| "archlinux" -> Some (`Archlinux `Latest)
824834
| "opensuse-42.1" -> Some (`OpenSUSE `V42_1)
@@ -905,6 +915,7 @@ let human_readable_string_of_distro (d : t) =
905915
| `Fedora `V39 -> "Fedora 39"
906916
| `Fedora `V40 -> "Fedora 40"
907917
| `Fedora `V41 -> "Fedora 41"
918+
| `Fedora `V42 -> "Fedora 42"
908919
| `OracleLinux `V7 -> "OracleLinux 7"
909920
| `OracleLinux `V8 -> "OracleLinux 8"
910921
| `OracleLinux `V9 -> "OracleLinux 9"
@@ -1058,6 +1069,7 @@ let bubblewrap_version (t : t) =
10581069
| `Fedora `V39 -> Some (0, 10, 0)
10591070
| `Fedora `V40 -> Some (0, 10, 0)
10601071
| `Fedora `V41 -> Some (0, 10, 0)
1072+
| `Fedora `V42 -> Some (0, 11, 0)
10611073
| `OracleLinux `V7 -> None
10621074
| `OracleLinux `V8 -> Some (0, 4, 0)
10631075
| `OracleLinux `V9 -> Some (0, 4, 1)
@@ -1195,6 +1207,7 @@ let base_distro_tag ?(arch = `X86_64) d =
11951207
| `V39 -> "39"
11961208
| `V40 -> "40"
11971209
| `V41 -> "41"
1210+
| `V42 -> "42"
11981211
in
11991212
("fedora", tag)
12001213
| `OracleLinux v ->

‎src-opam/distro.mli

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ type distro =
6666
| `V38
6767
| `V39
6868
| `V40
69-
| `V41 ]
69+
| `V41
70+
| `V42 ]
7071
| `OracleLinux of [ `V7 | `V8 | `V9 ]
7172
| `OpenSUSE of
7273
[ `V42_1
@@ -156,6 +157,7 @@ type t =
156157
| `V39
157158
| `V40
158159
| `V41
160+
| `V42
159161
| `Latest ]
160162
| `OracleLinux of [ `V7 | `V8 | `V9 | `Latest ]
161163
| `OpenSUSE of

0 commit comments

Comments
 (0)