Skip to content

Commit c097f9d

Browse files
mtelversmtelvers
authored
Add Alpine 3.22 (#236)
1 parent 9444945 commit c097f9d

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

‎src-opam/distro.ml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ type distro =
4040
| `V3_18
4141
| `V3_19
4242
| `V3_20
43-
| `V3_21 ]
43+
| `V3_21
44+
| `V3_22 ]
4445
| `Archlinux of [ `Latest ]
4546
| `CentOS of [ `V6 | `V7 | `V8 ]
4647
| `Debian of [ `V12 | `V11 | `V10 | `V9 | `V8 | `V7 | `Testing | `Unstable ]
@@ -130,6 +131,7 @@ type t =
130131
| `V3_19
131132
| `V3_20
132133
| `V3_21
134+
| `V3_22
133135
| `Latest ]
134136
| `Archlinux of [ `Latest ]
135137
| `CentOS of [ `V6 | `V7 | `V8 | `Latest ]
@@ -259,6 +261,7 @@ let distros : t list =
259261
`Alpine `V3_19;
260262
`Alpine `V3_20;
261263
`Alpine `V3_21;
264+
`Alpine `V3_22;
262265
`Alpine `Latest;
263266
`Archlinux `Latest;
264267
`CentOS `V6;
@@ -352,7 +355,7 @@ let distros : t list =
352355

353356
let resolve_alias (d : t) : distro =
354357
match d with
355-
| `Alpine `Latest -> `Alpine `V3_21
358+
| `Alpine `Latest -> `Alpine `V3_22
356359
| `CentOS `Latest -> `CentOS `V7
357360
| `Debian `Stable -> `Debian `V12
358361
| `Fedora `Latest -> `Fedora `V42
@@ -366,7 +369,7 @@ let resolve_alias (d : t) : distro =
366369
| ( `Alpine
367370
( `V3_3 | `V3_4 | `V3_5 | `V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10
368371
| `V3_11 | `V3_12 | `V3_13 | `V3_14 | `V3_15 | `V3_16 | `V3_17 | `V3_18
369-
| `V3_19 | `V3_20 | `V3_21 )
372+
| `V3_19 | `V3_20 | `V3_21 | `V3_22 )
370373
| `Archlinux `Latest
371374
| `CentOS (`V6 | `V7 | `V8)
372375
| `Debian (`V7 | `V8 | `V9 | `V10 | `V11 | `V12 | `Testing | `Unstable)
@@ -396,9 +399,9 @@ let distro_status (d : t) : status =
396399
| `Alpine
397400
( `V3_3 | `V3_4 | `V3_5 | `V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10
398401
| `V3_11 | `V3_12 | `V3_13 | `V3_14 | `V3_15 | `V3_16 | `V3_17 | `V3_18
399-
| `V3_19 | `V3_20 ) ->
402+
| `V3_19 | `V3_20 | `V3_21 ) ->
400403
`Deprecated
401-
| `Alpine `V3_21 -> `Active `Tier1
404+
| `Alpine `V3_22 -> `Active `Tier1
402405
| `Archlinux `Latest -> `Active `Tier3
403406
| `CentOS `V7 -> `Active `Tier3
404407
| `CentOS (`V6 | `V8) -> `Deprecated
@@ -473,7 +476,7 @@ let distro_arches ov (d : t) =
473476
| ( `Alpine
474477
( `V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10 | `V3_11 | `V3_12 | `V3_13
475478
| `V3_14 | `V3_15 | `V3_16 | `V3_17 | `V3_18 | `V3_19 | `V3_20 | `V3_21
476-
),
479+
| `V3_22 ),
477480
ov )
478481
when OV.(compare Releases.v4_05_0 ov) = -1 ->
479482
[ `X86_64; `Aarch64 ]
@@ -591,6 +594,7 @@ let builtin_ocaml_of_distro (d : t) : string option =
591594
| `Alpine `V3_19 -> Some "4.14.1"
592595
| `Alpine `V3_20 -> Some "4.14.2"
593596
| `Alpine `V3_21 -> Some "4.14.2"
597+
| `Alpine `V3_22 -> Some "4.14.2"
594598
| `Archlinux `Latest -> Some "5.1.0"
595599
| `Fedora `V21 -> Some "4.01.0"
596600
| `Fedora `V22 -> Some "4.02.0"
@@ -723,6 +727,7 @@ let tag_of_distro (d : t) =
723727
| `Alpine `V3_19 -> "alpine-3.19"
724728
| `Alpine `V3_20 -> "alpine-3.20"
725729
| `Alpine `V3_21 -> "alpine-3.21"
730+
| `Alpine `V3_22 -> "alpine-3.22"
726731
| `Alpine `Latest -> "alpine"
727732
| `Archlinux `Latest -> "archlinux"
728733
| `OpenSUSE `V42_1 -> "opensuse-42.1"
@@ -835,6 +840,7 @@ let distro_of_tag x : t option =
835840
| "alpine-3.19" -> Some (`Alpine `V3_19)
836841
| "alpine-3.20" -> Some (`Alpine `V3_20)
837842
| "alpine-3.21" -> Some (`Alpine `V3_21)
843+
| "alpine-3.22" -> Some (`Alpine `V3_22)
838844
| "alpine" -> Some (`Alpine `Latest)
839845
| "archlinux" -> Some (`Archlinux `Latest)
840846
| "opensuse-42.1" -> Some (`OpenSUSE `V42_1)
@@ -945,6 +951,7 @@ let human_readable_string_of_distro (d : t) =
945951
| `Alpine `V3_19 -> "Alpine 3.19"
946952
| `Alpine `V3_20 -> "Alpine 3.20"
947953
| `Alpine `V3_21 -> "Alpine 3.21"
954+
| `Alpine `V3_22 -> "Alpine 3.22"
948955
| `Archlinux `Latest -> "Archlinux"
949956
| `OpenSUSE `V42_1 -> "OpenSUSE 42.1"
950957
| `OpenSUSE `V42_2 -> "OpenSUSE 42.2"
@@ -1100,6 +1107,7 @@ let bubblewrap_version (t : t) =
11001107
| `Alpine `V3_19 -> Some (0, 8, 0)
11011108
| `Alpine `V3_20 -> Some (0, 10, 0)
11021109
| `Alpine `V3_21 -> Some (0, 11, 0)
1110+
| `Alpine `V3_22 -> Some (0, 11, 0)
11031111
| `Archlinux `Latest -> Some (0, 8, 0)
11041112
| `OpenSUSE `V42_1 -> None (* Not actually checked *)
11051113
| `OpenSUSE `V42_2 -> None (* Not actually checked *)
@@ -1140,6 +1148,7 @@ let base_distro_tag ?(arch = `X86_64) d =
11401148
| `V3_19 -> "3.19"
11411149
| `V3_20 -> "3.20"
11421150
| `V3_21 -> "3.21"
1151+
| `V3_22 -> "3.22"
11431152
in
11441153
match arch with `I386 -> ("i386/alpine", tag) | _ -> ("alpine", tag))
11451154
| `Archlinux `Latest -> ("archlinux", "latest")

‎src-opam/distro.mli

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ type distro =
4141
| `V3_18
4242
| `V3_19
4343
| `V3_20
44-
| `V3_21 ]
44+
| `V3_21
45+
| `V3_22 ]
4546
| `Archlinux of [ `Latest ]
4647
| `CentOS of [ `V6 | `V7 | `V8 ]
4748
| `Debian of [ `V12 | `V11 | `V10 | `V9 | `V8 | `V7 | `Testing | `Unstable ]
@@ -131,6 +132,7 @@ type t =
131132
| `V3_19
132133
| `V3_20
133134
| `V3_21
135+
| `V3_22
134136
| `Latest ]
135137
| `Archlinux of [ `Latest ]
136138
| `CentOS of [ `V6 | `V7 | `V8 | `Latest ]

0 commit comments

Comments
 (0)