Skip to content

Commit 7730768

Browse files
MisterDAMisterDA
committed
Add OpenSUSE Leap 15.6
1 parent 1004f21 commit 7730768

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

‎CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ unreleased
2020
(@MisterDA #175)
2121
- Support `--chmod` argument in `COPY` and `ADD` Dockerfile
2222
instructions. (@MisterDA #174)
23-
- Add OpenSUSE Leap 15.5 to Tier 2. (@MisterDA #171)
23+
- Add OpenSUSE Leap 15.6 to Tier 2, deprecate 15.5 and 15.4. (@MisterDA #171, #208)
2424
- Add OpenSUSE Tumbleweed to Tier 2. (@MisterDA #168 #169)
2525
- Deprecate Fedora 36. (@MisterDA #170)
2626
- Support opam new `--with-vendored-deps` configure option. (@MisterDA #165)

‎src-opam/distro.ml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ type distro =
7575
| `V15_3
7676
| `V15_4
7777
| `V15_5
78+
| `V15_6
7879
| `Tumbleweed ]
7980
| `Ubuntu of
8081
[ `V12_04
@@ -161,6 +162,7 @@ type t =
161162
| `V15_3
162163
| `V15_4
163164
| `V15_5
165+
| `V15_6
164166
| `Tumbleweed
165167
| `Latest ]
166168
| `Ubuntu of
@@ -293,6 +295,7 @@ let distros : t list =
293295
`OpenSUSE `V15_3;
294296
`OpenSUSE `V15_4;
295297
`OpenSUSE `V15_5;
298+
`OpenSUSE `V15_6;
296299
`OpenSUSE `Tumbleweed;
297300
`OpenSUSE `Latest;
298301
`Ubuntu `V12_04;
@@ -339,7 +342,7 @@ let resolve_alias (d : t) : distro =
339342
| `Debian `Stable -> `Debian `V12
340343
| `Fedora `Latest -> `Fedora `V40
341344
| `OracleLinux `Latest -> `OracleLinux `V9
342-
| `OpenSUSE `Latest -> `OpenSUSE `V15_5
345+
| `OpenSUSE `Latest -> `OpenSUSE `V15_6
343346
| `Ubuntu `Latest -> `Ubuntu `V24_04
344347
| `Ubuntu `LTS -> `Ubuntu `V24_04
345348
| `Cygwin `Latest -> `Cygwin `Ltsc2022
@@ -358,7 +361,7 @@ let resolve_alias (d : t) : distro =
358361
| `OracleLinux (`V7 | `V8 | `V9)
359362
| `OpenSUSE
360363
( `V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 | `V15_4
361-
| `V15_5 | `Tumbleweed )
364+
| `V15_5 | `V15_6 | `Tumbleweed )
362365
| `Ubuntu
363366
( `V12_04 | `V14_04 | `V15_04 | `V15_10 | `V16_04 | `V16_10 | `V17_04
364367
| `V17_10 | `V18_04 | `V18_10 | `V19_04 | `V19_10 | `V20_04 | `V20_10
@@ -395,10 +398,10 @@ let distro_status (d : t) : status =
395398
| `OracleLinux `V7 -> `Deprecated
396399
| `OracleLinux (`V8 | `V9) -> `Active `Tier3
397400
| `OpenSUSE
398-
(`V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 | `V15_4)
399-
->
401+
( `V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 | `V15_4
402+
| `V15_5 ) ->
400403
`Deprecated
401-
| `OpenSUSE `V15_5 -> `Active `Tier2
404+
| `OpenSUSE `V15_6 -> `Active `Tier2
402405
| `OpenSUSE `Tumbleweed -> `Active `Tier2
403406
| `Ubuntu (`V20_04 | `V22_04 | `V23_04 | `V23_10 | `V24_04) ->
404407
`Active `Tier2
@@ -466,8 +469,8 @@ let distro_arches ov (d : t) =
466469
| `Fedora (`V33 | `V34 | `V35 | `V36 | `V37 | `V38 | `V39 | `V40), ov
467470
when OV.(compare Releases.v4_08_0 ov) = -1 ->
468471
[ `X86_64; `Aarch64 ]
469-
| `OpenSUSE (`V15_4 | `V15_5), ov when OV.(compare Releases.v4_02_0 ov) = -1
470-
->
472+
| `OpenSUSE (`V15_4 | `V15_5 | `V15_6), ov
473+
when OV.(compare Releases.v4_02_0 ov) = -1 ->
471474
[ `X86_64; `Aarch64 ]
472475
(* OCaml for Windows doesn't package OCaml 5.0.
473476
TODO: remove when upstream opam gains OCaml packages on Windows. *)
@@ -596,6 +599,7 @@ let builtin_ocaml_of_distro (d : t) : string option =
596599
| `OpenSUSE `V15_3 -> Some "4.05.0"
597600
| `OpenSUSE `V15_4 -> Some "4.05.0"
598601
| `OpenSUSE `V15_5 -> Some "4.05.0"
602+
| `OpenSUSE `V15_6 -> Some "4.14.2"
599603
| `OpenSUSE `Tumbleweed -> Some "4.14.1"
600604
| `OracleLinux `V7 -> Some "4.01.0"
601605
| `OracleLinux `V8 -> Some "4.07.0"
@@ -698,6 +702,7 @@ let tag_of_distro (d : t) =
698702
| `OpenSUSE `V15_3 -> "opensuse-15.3"
699703
| `OpenSUSE `V15_4 -> "opensuse-15.4"
700704
| `OpenSUSE `V15_5 -> "opensuse-15.5"
705+
| `OpenSUSE `V15_6 -> "opensuse-15.6"
701706
| `OpenSUSE `Tumbleweed -> "opensuse-tumbleweed"
702707
| `OpenSUSE `Latest -> "opensuse"
703708
| `Cygwin `Ltsc2016 -> "cygwin-2016"
@@ -804,6 +809,7 @@ let distro_of_tag x : t option =
804809
| "opensuse-15.3" -> Some (`OpenSUSE `V15_3)
805810
| "opensuse-15.4" -> Some (`OpenSUSE `V15_4)
806811
| "opensuse-15.5" -> Some (`OpenSUSE `V15_5)
812+
| "opensuse-15.6" -> Some (`OpenSUSE `V15_6)
807813
| "opensuse-tumbleweed" -> Some (`OpenSUSE `Tumbleweed)
808814
| "opensuse" -> Some (`OpenSUSE `Latest)
809815
| "cygwin-ltsc2016" -> Some (`Cygwin `Ltsc2016)
@@ -907,6 +913,7 @@ let human_readable_string_of_distro (d : t) =
907913
| `OpenSUSE `V15_3 -> "OpenSUSE 15.3 (Leap)"
908914
| `OpenSUSE `V15_4 -> "OpenSUSE 15.4 (Leap)"
909915
| `OpenSUSE `V15_5 -> "OpenSUSE 15.5 (Leap)"
916+
| `OpenSUSE `V15_6 -> "OpenSUSE 15.6 (Leap)"
910917
| `OpenSUSE `Tumbleweed -> "OpenSUSE Tumbleweed"
911918
| `Cygwin `Ltsc2016 -> "Cygwin Ltsc2016"
912919
| `Cygwin `Ltsc2019 -> "Cygwin Ltsc2019"
@@ -1056,6 +1063,7 @@ let bubblewrap_version (t : t) =
10561063
| `OpenSUSE `V15_3 -> Some (0, 4, 1)
10571064
| `OpenSUSE `V15_4 -> Some (0, 4, 1)
10581065
| `OpenSUSE `V15_5 -> Some (0, 7, 0)
1066+
| `OpenSUSE `V15_6 -> Some (0, 8, 0)
10591067
| `OpenSUSE `Tumbleweed -> Some (0, 8, 0)
10601068
| `Cygwin _ -> None
10611069
| `Windows _ -> None
@@ -1177,6 +1185,7 @@ let base_distro_tag ?(arch = `X86_64) d =
11771185
| `V15_3 -> "15.3"
11781186
| `V15_4 -> "15.4"
11791187
| `V15_5 -> "15.5"
1188+
| `V15_6 -> "15.6"
11801189
| `Tumbleweed -> assert false
11811190
in
11821191
("opensuse/leap", tag)

‎src-opam/distro.mli

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ type distro =
7777
| `V15_3
7878
| `V15_4
7979
| `V15_5
80+
| `V15_6
8081
| `Tumbleweed ]
8182
| `Ubuntu of
8283
[ `V12_04
@@ -163,6 +164,7 @@ type t =
163164
| `V15_3
164165
| `V15_4
165166
| `V15_5
167+
| `V15_6
166168
| `Tumbleweed
167169
| `Latest ]
168170
| `Ubuntu of

0 commit comments

Comments
 (0)