Skip to content

Commit 5528a58

Browse files
mtelversMisterDA
mtelvers
authored and
MisterDA
committed
Add Ubuntu 25.04
1 parent 969de84 commit 5528a58

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

‎CHANGES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11

2+
unreleased
3+
----------
4+
5+
- Add Ubuntu 25.04. (@mtelvers, #233)
6+
27
v8.2.8 2025-06-01
38
-----------------
49

‎src-opam/distro.ml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ type distro =
102102
| `V23_04
103103
| `V23_10
104104
| `V24_04
105-
| `V24_10 ]
105+
| `V24_10
106+
| `V25_04 ]
106107
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 ]
107108
| `Windows of [ `Mingw | `Msvc ] * [ `Ltsc2019 ]
108109
| `WindowsServer of [ `Mingw | `Msvc ] * [ `Ltsc2022 ] ]
@@ -195,6 +196,7 @@ type t =
195196
| `V23_10
196197
| `V24_04
197198
| `V24_10
199+
| `V25_04
198200
| `Latest
199201
| `LTS ]
200202
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 | `Latest ]
@@ -331,6 +333,7 @@ let distros : t list =
331333
`Ubuntu `V23_10;
332334
`Ubuntu `V24_04;
333335
`Ubuntu `V24_10;
336+
`Ubuntu `V25_04;
334337
`Ubuntu `Latest;
335338
`Ubuntu `LTS;
336339
`Cygwin `Ltsc2016;
@@ -355,7 +358,7 @@ let resolve_alias (d : t) : distro =
355358
| `Fedora `Latest -> `Fedora `V42
356359
| `OracleLinux `Latest -> `OracleLinux `V9
357360
| `OpenSUSE `Latest -> `OpenSUSE `V15_6
358-
| `Ubuntu `Latest -> `Ubuntu `V24_10
361+
| `Ubuntu `Latest -> `Ubuntu `V25_04
359362
| `Ubuntu `LTS -> `Ubuntu `V24_04
360363
| `Cygwin `Latest -> `Cygwin `Ltsc2022
361364
| `Windows (cc, `Latest) -> `Windows (cc, `Ltsc2019)
@@ -379,7 +382,7 @@ let resolve_alias (d : t) : distro =
379382
( `V12_04 | `V14_04 | `V15_04 | `V15_10 | `V16_04 | `V16_10 | `V17_04
380383
| `V17_10 | `V18_04 | `V18_10 | `V19_04 | `V19_10 | `V20_04 | `V20_10
381384
| `V21_04 | `V21_10 | `V22_04 | `V22_10 | `V23_04 | `V23_10 | `V24_04
382-
| `V24_10 )
385+
| `V24_10 | `V25_04 )
383386
| `Cygwin (`Ltsc2016 | `Ltsc2019 | `Ltsc2022)
384387
| `Windows (_, `Ltsc2019)
385388
| `WindowsServer (_, `Ltsc2022) ) as d ->
@@ -418,7 +421,7 @@ let distro_status (d : t) : status =
418421
`Deprecated
419422
| `OpenSUSE `V15_6 -> `Active `Tier2
420423
| `OpenSUSE `Tumbleweed -> `Active `Tier2
421-
| `Ubuntu (`V22_04 | `V24_04 | `V24_10) -> `Active `Tier2
424+
| `Ubuntu (`V22_04 | `V24_04 | `V24_10 | `V25_04) -> `Active `Tier2
422425
| `Ubuntu
423426
( `V12_04 | `V14_04 | `V15_04 | `V15_10 | `V16_04 | `V16_10 | `V17_04
424427
| `V17_10 | `V18_04 | `V18_10 | `V19_04 | `V19_10 | `V20_04 | `V20_10
@@ -478,7 +481,7 @@ let distro_arches ov (d : t) =
478481
[ `X86_64; `Aarch64; `Ppc64le; `S390x ]
479482
| ( `Ubuntu
480483
( `V20_04 | `V20_10 | `V21_04 | `V21_10 | `V22_04 | `V22_10 | `V23_04
481-
| `V23_10 | `V24_04 | `V24_10 ),
484+
| `V23_10 | `V24_04 | `V24_10 | `V25_04 ),
482485
ov )
483486
when OV.(compare Releases.v4_05_0 ov) = -1 ->
484487
let base = [ `X86_64; `Aarch64; `Ppc64le; `S390x ] in
@@ -568,6 +571,7 @@ let builtin_ocaml_of_distro (d : t) : string option =
568571
| `Ubuntu `V23_10 -> Some "4.13.1"
569572
| `Ubuntu `V24_04 -> Some "4.14.1"
570573
| `Ubuntu `V24_10 -> Some "5.2.0"
574+
| `Ubuntu `V25_04 -> Some "5.3.0"
571575
| `Alpine `V3_3 -> Some "4.02.3"
572576
| `Alpine `V3_4 -> Some "4.02.3"
573577
| `Alpine `V3_5 -> Some "4.04.0"
@@ -657,6 +661,7 @@ let tag_of_distro (d : t) =
657661
| `Ubuntu `V23_10 -> "ubuntu-23.10"
658662
| `Ubuntu `V24_04 -> "ubuntu-24.04"
659663
| `Ubuntu `V24_10 -> "ubuntu-24.10"
664+
| `Ubuntu `V25_04 -> "ubuntu-25.04"
660665
| `Ubuntu `Latest -> "ubuntu"
661666
| `Ubuntu `LTS -> "ubuntu-lts"
662667
| `Debian `Stable -> "debian-stable"
@@ -769,6 +774,7 @@ let distro_of_tag x : t option =
769774
| "ubuntu-23.10" -> Some (`Ubuntu `V23_10)
770775
| "ubuntu-24.04" -> Some (`Ubuntu `V24_04)
771776
| "ubuntu-24.10" -> Some (`Ubuntu `V24_10)
777+
| "ubuntu-25.04" -> Some (`Ubuntu `V25_04)
772778
| "ubuntu" -> Some (`Ubuntu `Latest)
773779
| "ubuntu-lts" -> Some (`Ubuntu `LTS)
774780
| "debian-stable" -> Some (`Debian `Stable)
@@ -883,6 +889,7 @@ let human_readable_string_of_distro (d : t) =
883889
| `Ubuntu `V23_10 -> "Ubuntu 23.10"
884890
| `Ubuntu `V24_04 -> "Ubuntu 24.04"
885891
| `Ubuntu `V24_10 -> "Ubuntu 24.10"
892+
| `Ubuntu `V25_04 -> "Ubuntu 25.04"
886893
| `Debian `Unstable -> "Debian Unstable"
887894
| `Debian `Testing -> "Debian Testing"
888895
| `Debian `V12 -> "Debian 12 (Bookworm)"
@@ -1037,6 +1044,7 @@ let bubblewrap_version (t : t) =
10371044
| `Ubuntu `V23_10 -> Some (0, 8, 0)
10381045
| `Ubuntu `V24_04 -> Some (0, 9, 0)
10391046
| `Ubuntu `V24_10 -> Some (0, 10, 0)
1047+
| `Ubuntu `V25_04 -> Some (0, 11, 0)
10401048
| `Debian `V7 -> None (* Not actually checked *)
10411049
| `Debian `V8 -> None (* Not actually checked *)
10421050
| `Debian `V9 -> Some (0, 1, 7)
@@ -1178,6 +1186,7 @@ let base_distro_tag ?(arch = `X86_64) d =
11781186
| `V23_10 -> "mantic"
11791187
| `V24_04 -> "noble"
11801188
| `V24_10 -> "oracular"
1189+
| `V25_04 -> "plucky"
11811190
in
11821191
("ubuntu", tag)
11831192
| `CentOS v ->

‎src-opam/distro.mli

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ type distro =
103103
| `V23_04
104104
| `V23_10
105105
| `V24_04
106-
| `V24_10 ]
106+
| `V24_10
107+
| `V25_04 ]
107108
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 ]
108109
| `Windows of [ `Mingw | `Msvc ] * [ `Ltsc2019 ]
109110
| `WindowsServer of [ `Mingw | `Msvc ] * [ `Ltsc2022 ] ]
@@ -196,6 +197,7 @@ type t =
196197
| `V23_10
197198
| `V24_04
198199
| `V24_10
200+
| `V25_04
199201
| `Latest
200202
| `LTS ]
201203
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 | `Latest ]

0 commit comments

Comments
 (0)