Skip to content

Commit ab4b839

Browse files
MisterDAMisterDA
authored
Add Ubuntu 24.10 (#222)
1 parent a785d66 commit ab4b839

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

‎CHANGES.md

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

4+
- Add Ubuntu 24.10. (@MisterDA, #222)
5+
46
v8.2.2 2024-07-31 Rochester
57
---------------------------
68

‎src-opam/distro.ml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ type distro =
9898
| `V22_10
9999
| `V23_04
100100
| `V23_10
101-
| `V24_04 ]
101+
| `V24_04
102+
| `V24_10 ]
102103
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 ]
103104
| `Windows of [ `Mingw | `Msvc ] * [ `Ltsc2019 ]
104105
| `WindowsServer of [ `Mingw | `Msvc ] * [ `Ltsc2022 ] ]
@@ -187,6 +188,7 @@ type t =
187188
| `V23_04
188189
| `V23_10
189190
| `V24_04
191+
| `V24_10
190192
| `Latest
191193
| `LTS ]
192194
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 | `Latest ]
@@ -319,6 +321,7 @@ let distros : t list =
319321
`Ubuntu `V23_04;
320322
`Ubuntu `V23_10;
321323
`Ubuntu `V24_04;
324+
`Ubuntu `V24_10;
322325
`Ubuntu `Latest;
323326
`Ubuntu `LTS;
324327
`Cygwin `Ltsc2016;
@@ -343,7 +346,7 @@ let resolve_alias (d : t) : distro =
343346
| `Fedora `Latest -> `Fedora `V40
344347
| `OracleLinux `Latest -> `OracleLinux `V9
345348
| `OpenSUSE `Latest -> `OpenSUSE `V15_6
346-
| `Ubuntu `Latest -> `Ubuntu `V24_04
349+
| `Ubuntu `Latest -> `Ubuntu `V24_10
347350
| `Ubuntu `LTS -> `Ubuntu `V24_04
348351
| `Cygwin `Latest -> `Cygwin `Ltsc2022
349352
| `Windows (cc, `Latest) -> `Windows (cc, `Ltsc2019)
@@ -365,7 +368,8 @@ let resolve_alias (d : t) : distro =
365368
| `Ubuntu
366369
( `V12_04 | `V14_04 | `V15_04 | `V15_10 | `V16_04 | `V16_10 | `V17_04
367370
| `V17_10 | `V18_04 | `V18_10 | `V19_04 | `V19_10 | `V20_04 | `V20_10
368-
| `V21_04 | `V21_10 | `V22_04 | `V22_10 | `V23_04 | `V23_10 | `V24_04 )
371+
| `V21_04 | `V21_10 | `V22_04 | `V22_10 | `V23_04 | `V23_10 | `V24_04
372+
| `V24_10 )
369373
| `Cygwin (`Ltsc2016 | `Ltsc2019 | `Ltsc2022)
370374
| `Windows (_, `Ltsc2019)
371375
| `WindowsServer (_, `Ltsc2022) ) as d ->
@@ -403,7 +407,7 @@ let distro_status (d : t) : status =
403407
`Deprecated
404408
| `OpenSUSE `V15_6 -> `Active `Tier2
405409
| `OpenSUSE `Tumbleweed -> `Active `Tier2
406-
| `Ubuntu (`V20_04 | `V22_04 | `V24_04) -> `Active `Tier2
410+
| `Ubuntu (`V20_04 | `V22_04 | `V24_04 | `V24_10) -> `Active `Tier2
407411
| `Ubuntu
408412
( `V12_04 | `V14_04 | `V15_04 | `V15_10 | `V16_04 | `V16_10 | `V17_04
409413
| `V17_10 | `V18_04 | `V18_10 | `V19_04 | `V19_10 | `V20_10 | `V21_04
@@ -462,7 +466,7 @@ let distro_arches ov (d : t) =
462466
[ `X86_64; `Aarch64; `Ppc64le; `S390x ]
463467
| ( `Ubuntu
464468
( `V20_04 | `V20_10 | `V21_04 | `V21_10 | `V22_04 | `V22_10 | `V23_04
465-
| `V23_10 | `V24_04 ),
469+
| `V23_10 | `V24_04 | `V24_10 ),
466470
ov )
467471
when OV.(compare Releases.v4_05_0 ov) = -1 ->
468472
let base = [ `X86_64; `Aarch64; `Ppc64le; `S390x ] in
@@ -549,6 +553,7 @@ let builtin_ocaml_of_distro (d : t) : string option =
549553
| `Ubuntu `V23_04 -> Some "4.13.1"
550554
| `Ubuntu `V23_10 -> Some "4.13.1"
551555
| `Ubuntu `V24_04 -> Some "4.14.1"
556+
| `Ubuntu `V24_10 -> Some "5.2.0"
552557
| `Alpine `V3_3 -> Some "4.02.3"
553558
| `Alpine `V3_4 -> Some "4.02.3"
554559
| `Alpine `V3_5 -> Some "4.04.0"
@@ -634,6 +639,7 @@ let tag_of_distro (d : t) =
634639
| `Ubuntu `V23_04 -> "ubuntu-23.04"
635640
| `Ubuntu `V23_10 -> "ubuntu-23.10"
636641
| `Ubuntu `V24_04 -> "ubuntu-24.04"
642+
| `Ubuntu `V24_10 -> "ubuntu-24.10"
637643
| `Ubuntu `Latest -> "ubuntu"
638644
| `Ubuntu `LTS -> "ubuntu-lts"
639645
| `Debian `Stable -> "debian-stable"
@@ -742,6 +748,7 @@ let distro_of_tag x : t option =
742748
| "ubuntu-23.04" -> Some (`Ubuntu `V23_04)
743749
| "ubuntu-23.10" -> Some (`Ubuntu `V23_10)
744750
| "ubuntu-24.04" -> Some (`Ubuntu `V24_04)
751+
| "ubuntu-24.10" -> Some (`Ubuntu `V24_10)
745752
| "ubuntu" -> Some (`Ubuntu `Latest)
746753
| "ubuntu-lts" -> Some (`Ubuntu `LTS)
747754
| "debian-stable" -> Some (`Debian `Stable)
@@ -852,6 +859,7 @@ let human_readable_string_of_distro (d : t) =
852859
| `Ubuntu `V23_04 -> "Ubuntu 23.04"
853860
| `Ubuntu `V23_10 -> "Ubuntu 23.10"
854861
| `Ubuntu `V24_04 -> "Ubuntu 24.04"
862+
| `Ubuntu `V24_10 -> "Ubuntu 24.10"
855863
| `Debian `Unstable -> "Debian Unstable"
856864
| `Debian `Testing -> "Debian Testing"
857865
| `Debian `V12 -> "Debian 12 (Bookworm)"
@@ -1002,6 +1010,7 @@ let bubblewrap_version (t : t) =
10021010
| `Ubuntu `V23_04 -> Some (0, 8, 0)
10031011
| `Ubuntu `V23_10 -> Some (0, 8, 0)
10041012
| `Ubuntu `V24_04 -> Some (0, 9, 0)
1013+
| `Ubuntu `V24_10 -> Some (0, 10, 0)
10051014
| `Debian `V7 -> None (* Not actually checked *)
10061015
| `Debian `V8 -> None (* Not actually checked *)
10071016
| `Debian `V9 -> Some (0, 1, 7)
@@ -1138,6 +1147,7 @@ let base_distro_tag ?(arch = `X86_64) d =
11381147
| `V23_04 -> "lunar"
11391148
| `V23_10 -> "mantic"
11401149
| `V24_04 -> "noble"
1150+
| `V24_10 -> "oracular"
11411151
in
11421152
("ubuntu", tag)
11431153
| `CentOS v ->

‎src-opam/distro.mli

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ type distro =
100100
| `V22_10
101101
| `V23_04
102102
| `V23_10
103-
| `V24_04 ]
103+
| `V24_04
104+
| `V24_10 ]
104105
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 ]
105106
| `Windows of [ `Mingw | `Msvc ] * [ `Ltsc2019 ]
106107
| `WindowsServer of [ `Mingw | `Msvc ] * [ `Ltsc2022 ] ]
@@ -189,6 +190,7 @@ type t =
189190
| `V23_04
190191
| `V23_10
191192
| `V24_04
193+
| `V24_10
192194
| `Latest
193195
| `LTS ]
194196
| `Cygwin of [ `Ltsc2016 | `Ltsc2019 | `Ltsc2022 | `Latest ]

0 commit comments

Comments
 (0)