Add OpenSUSE Leap 15.5 to Tier 2 (ocurrent#171)

mtelvers · Jun 28, 2023 · c2cb3b2 · c2cb3b2
1 parent 9192670
commit c2cb3b2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,7 @@ unreleased
 ----------
 
 - Add Debian 12 as main distribution. (@MisterDA #172)
+- Add OpenSUSE Leap 15.5 to Tier 2. (@MisterDA #171)
 - Add OpenSUSE Tumbleweed to Tier 2. (@MisterDA #168 #169)
 - Deprecate Fedora 36. (@MisterDA #170)
 - Add Alpine 3.18. (@MisterDA #167)

diff --git a/src-opam/distro.ml b/src-opam/distro.ml
@@ -291,6 +291,7 @@ type distro =
     | `V15_2
     | `V15_3
     | `V15_4
+    | `V15_5
     | `Tumbleweed ]
   | `Ubuntu of
     [ `V12_04
@@ -369,6 +370,7 @@ type t =
     | `V15_2
     | `V15_3
     | `V15_4
+    | `V15_5
     | `Tumbleweed
     | `Latest ]
   | `Ubuntu of
@@ -492,6 +494,7 @@ let distros : t list =
     `OpenSUSE `V15_2;
     `OpenSUSE `V15_3;
     `OpenSUSE `V15_4;
+    `OpenSUSE `V15_5;
     `OpenSUSE `Tumbleweed;
     `OpenSUSE `Latest;
     `Ubuntu `V12_04;
@@ -597,7 +600,7 @@ let resolve_alias (d : t) : distro =
   | `Debian `Stable -> `Debian `V12
   | `Fedora `Latest -> `Fedora `V38
   | `OracleLinux `Latest -> `OracleLinux `V9
-  | `OpenSUSE `Latest -> `OpenSUSE `V15_4
+  | `OpenSUSE `Latest -> `OpenSUSE `V15_5
   | `Ubuntu `Latest -> `Ubuntu `V23_04
   | `Ubuntu `LTS -> `Ubuntu `V22_04
   | `Cygwin (#win10_ltsc as v) -> `Cygwin (resolve_ltsc v)
@@ -615,7 +618,7 @@ let resolve_alias (d : t) : distro =
     | `OracleLinux (`V7 | `V8 | `V9)
     | `OpenSUSE
         ( `V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 | `V15_4
-        | `Tumbleweed )
+        | `V15_5 | `Tumbleweed )
     | `Ubuntu
         ( `V12_04 | `V14_04 | `V15_04 | `V15_10 | `V16_04 | `V16_10 | `V17_04
         | `V17_10 | `V18_04 | `V18_10 | `V19_04 | `V19_10 | `V20_04 | `V20_10
@@ -658,7 +661,7 @@ let distro_status (d : t) : status =
     | `OpenSUSE (`V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3)
       ->
         `Deprecated
-    | `OpenSUSE `V15_4 -> `Active `Tier2
+    | `OpenSUSE (`V15_4 | `V15_5) -> `Active `Tier2
     | `OpenSUSE `Tumbleweed -> `Active `Tier2
     | `Ubuntu `V18_04 -> `Active `Tier3
     | `Ubuntu (`V20_04 | `V22_04 | `V22_10 | `V23_04) -> `Active `Tier2
@@ -838,6 +841,7 @@ let builtin_ocaml_of_distro (d : t) : string option =
   | `OpenSUSE `V15_2 -> Some "4.05.0"
   | `OpenSUSE `V15_3 -> Some "4.05.0"
   | `OpenSUSE `V15_4 -> Some "4.05.0"
+  | `OpenSUSE `V15_5 -> Some "4.05.0"
   | `OpenSUSE `Tumbleweed -> Some "4.14.1"
   | `OracleLinux `V7 -> Some "4.01.0"
   | `OracleLinux `V8 -> Some "4.07.0"
@@ -1001,6 +1005,7 @@ let tag_of_distro (d : t) =
   | `OpenSUSE `V15_2 -> "opensuse-15.2"
   | `OpenSUSE `V15_3 -> "opensuse-15.3"
   | `OpenSUSE `V15_4 -> "opensuse-15.4"
+  | `OpenSUSE `V15_5 -> "opensuse-15.5"
   | `OpenSUSE `Tumbleweed -> "opensuse-tumbleweed"
   | `OpenSUSE `Latest -> "opensuse"
   | `Cygwin v -> "cygwin-" ^ win10_release_to_string v
@@ -1095,6 +1100,7 @@ let distro_of_tag x : t option =
   | "opensuse-15.2" -> Some (`OpenSUSE `V15_2)
   | "opensuse-15.3" -> Some (`OpenSUSE `V15_3)
   | "opensuse-15.4" -> Some (`OpenSUSE `V15_4)
+  | "opensuse-15.5" -> Some (`OpenSUSE `V15_5)
   | "opensuse-tumbleweed" -> Some (`OpenSUSE `Tumbleweed)
   | "opensuse" -> Some (`OpenSUSE `Latest)
   | s when String.is_prefix ~affix:"cygwin-" s ->
@@ -1185,6 +1191,7 @@ let human_readable_string_of_distro (d : t) =
     | `OpenSUSE `V15_2 -> "OpenSUSE 15.2 (Leap)"
     | `OpenSUSE `V15_3 -> "OpenSUSE 15.3 (Leap)"
     | `OpenSUSE `V15_4 -> "OpenSUSE 15.4 (Leap)"
+    | `OpenSUSE `V15_5 -> "OpenSUSE 15.5 (Leap)"
     | `OpenSUSE `Tumbleweed -> "OpenSUSE Tumbleweed"
     | `Cygwin v -> "Cygwin " ^ win10_release_to_string v
     | `Windows (`Mingw, v) -> "Windows mingw " ^ win10_release_to_string v
@@ -1319,6 +1326,7 @@ let bubblewrap_version (t : t) =
   | `OpenSUSE `V15_2 -> Some (0, 4, 1)
   | `OpenSUSE `V15_3 -> Some (0, 4, 1)
   | `OpenSUSE `V15_4 -> Some (0, 4, 1)
+  | `OpenSUSE `V15_5 -> Some (0, 7, 0)
   | `OpenSUSE `Tumbleweed -> Some (0, 8, 0)
   | `Cygwin _ -> None
   | `Windows _ -> None
@@ -1442,6 +1450,7 @@ let base_distro_tag ?win10_revision ?(arch = `X86_64) d =
         | `V15_2 -> "15.2"
         | `V15_3 -> "15.3"
         | `V15_4 -> "15.4"
+        | `V15_5 -> "15.5"
         | `Tumbleweed -> assert false
       in
       ("opensuse/leap", tag)

diff --git a/src-opam/distro.mli b/src-opam/distro.mli
@@ -136,6 +136,7 @@ type distro =
     | `V15_2
     | `V15_3
     | `V15_4
+    | `V15_5
     | `Tumbleweed ]
   | `Ubuntu of
     [ `V12_04
@@ -215,6 +216,7 @@ type t =
     | `V15_2
     | `V15_3
     | `V15_4
+    | `V15_5
     | `Tumbleweed
     | `Latest ]
   | `Ubuntu of