Merge pull request #129 from ocurrent/alpine-3.17

Add Alpine 3.17
ocurrent · Nov 25, 2022 · 1d5841d · 1d5841d
2 parents 2449762 + 0890a0e
commit 1d5841d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,8 @@
-
 unreleased
 ----------
 
+- Add Alpine 3.17 (3.16 is now tier 2 and 3.15 is deprecated). (@MisterDA #129)
+
 v8.1.0 2022-11-17 Sydney
 ----------
 - Add Fedora 36 and 37 and deprecate 34 and 35. (@MisterDA #125, #126)

diff --git a/src-opam/distro.ml b/src-opam/distro.ml
@@ -214,7 +214,8 @@ type distro =
     | `V3_13
     | `V3_14
     | `V3_15
-    | `V3_16 ]
+    | `V3_16
+    | `V3_17 ]
   | `Archlinux of [ `Latest ]
   | `CentOS of [ `V6 | `V7 | `V8 ]
   | `Debian of [ `V11 | `V10 | `V9 | `V8 | `V7 | `Testing | `Unstable ]
@@ -277,6 +278,7 @@ type t =
     | `V3_14
     | `V3_15
     | `V3_16
+    | `V3_17
     | `Latest ]
   | `Archlinux of [ `Latest ]
   | `CentOS of [ `V6 | `V7 | `V8 | `Latest ]
@@ -377,6 +379,7 @@ let distros : t list =
     `Alpine `V3_14;
     `Alpine `V3_15;
     `Alpine `V3_16;
+    `Alpine `V3_17;
     `Alpine `Latest;
     `Archlinux `Latest;
     `CentOS `V6;
@@ -515,7 +518,7 @@ let win10_latest_image = `V21H2
 
 let resolve_alias (d : t) : distro =
   match d with
-  | `Alpine `Latest -> `Alpine `V3_16
+  | `Alpine `Latest -> `Alpine `V3_17
   | `CentOS `Latest -> `CentOS `V7
   | `Debian `Stable -> `Debian `V11
   | `Fedora `Latest -> `Fedora `V37
@@ -527,7 +530,7 @@ let resolve_alias (d : t) : distro =
   | `Windows (cc, (#win10_ltsc as v)) -> `Windows (cc, resolve_ltsc v)
   | ( `Alpine
         ( `V3_3 | `V3_4 | `V3_5 | `V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10
-        | `V3_11 | `V3_12 | `V3_13 | `V3_14 | `V3_15 | `V3_16 )
+        | `V3_11 | `V3_12 | `V3_13 | `V3_14 | `V3_15 | `V3_16 | `V3_17 )
     | `Archlinux `Latest
     | `CentOS (`V6 | `V7 | `V8)
     | `Debian (`V7 | `V8 | `V9 | `V10 | `V11 | `Testing | `Unstable)
@@ -556,10 +559,10 @@ let distro_status (d : t) : status =
     match resolve_alias d with
     | `Alpine
         ( `V3_3 | `V3_4 | `V3_5 | `V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10
-        | `V3_11 | `V3_12 | `V3_13 | `V3_14 ) ->
+        | `V3_11 | `V3_12 | `V3_13 | `V3_14 | `V3_15 ) ->
         `Deprecated
-    | `Alpine `V3_15 -> `Active `Tier2
-    | `Alpine `V3_16 -> `Active `Tier1
+    | `Alpine `V3_16 -> `Active `Tier2
+    | `Alpine `V3_17 -> `Active `Tier1
     | `Archlinux `Latest -> `Active `Tier3
     | `CentOS `V7 -> `Active `Tier3
     | `CentOS (`V6 | `V8) -> `Deprecated
@@ -626,7 +629,7 @@ let distro_arches ov (d : t) =
       [ `I386; `X86_64; `Aarch64; `Aarch32 ]
   | ( `Alpine
         ( `V3_6 | `V3_7 | `V3_8 | `V3_9 | `V3_10 | `V3_11 | `V3_12 | `V3_13
-        | `V3_14 | `V3_15 | `V3_16 ),
+        | `V3_14 | `V3_15 | `V3_16 | `V3_17 ),
       ov )
     when OV.(compare Releases.v4_05_0 ov) = -1 ->
       [ `X86_64; `Aarch64 ]
@@ -714,6 +717,7 @@ let builtin_ocaml_of_distro (d : t) : string option =
   | `Alpine `V3_14 -> Some "4.12.0"
   | `Alpine `V3_15 -> Some "4.13.1"
   | `Alpine `V3_16 -> Some "4.14.0"
+  | `Alpine `V3_17 -> Some "4.14.0"
   | `Archlinux `Latest -> Some "4.11.1"
   | `Fedora `V21 -> Some "4.01.0"
   | `Fedora `V22 -> Some "4.02.0"
@@ -887,6 +891,7 @@ let tag_of_distro (d : t) =
   | `Alpine `V3_14 -> "alpine-3.14"
   | `Alpine `V3_15 -> "alpine-3.15"
   | `Alpine `V3_16 -> "alpine-3.16"
+  | `Alpine `V3_17 -> "alpine-3.17"
   | `Alpine `Latest -> "alpine"
   | `Archlinux `Latest -> "archlinux"
   | `OpenSUSE `V42_1 -> "opensuse-42.1"
@@ -975,6 +980,7 @@ let distro_of_tag x : t option =
   | "alpine-3.14" -> Some (`Alpine `V3_14)
   | "alpine-3.15" -> Some (`Alpine `V3_15)
   | "alpine-3.16" -> Some (`Alpine `V3_16)
+  | "alpine-3.17" -> Some (`Alpine `V3_17)
   | "alpine" -> Some (`Alpine `Latest)
   | "archlinux" -> Some (`Archlinux `Latest)
   | "opensuse-42.1" -> Some (`OpenSUSE `V42_1)
@@ -1058,6 +1064,7 @@ let human_readable_string_of_distro (d : t) =
     | `Alpine `V3_14 -> "Alpine 3.14"
     | `Alpine `V3_15 -> "Alpine 3.15"
     | `Alpine `V3_16 -> "Alpine 3.16"
+    | `Alpine `V3_17 -> "Alpine 3.17"
     | `Archlinux `Latest -> "Archlinux"
     | `OpenSUSE `V42_1 -> "OpenSUSE 42.1"
     | `OpenSUSE `V42_2 -> "OpenSUSE 42.2"
@@ -1183,6 +1190,7 @@ let rec bubblewrap_version (t : t) =
   | `Alpine `V3_14 -> Some (0, 4, 1)
   | `Alpine `V3_15 -> Some (0, 5, 0)
   | `Alpine `V3_16 -> Some (0, 6, 2)
+  | `Alpine `V3_17 -> Some (0, 6, 2)
   | `Archlinux `Latest -> Some (0, 5, 0)
   | `OpenSUSE `V42_1 -> None (* Not actually checked *)
   | `OpenSUSE `V42_2 -> None (* Not actually checked *)
@@ -1223,6 +1231,7 @@ let base_distro_tag ?win10_revision ?(arch = `X86_64) d =
         | `V3_14 -> "3.14"
         | `V3_15 -> "3.15"
         | `V3_16 -> "3.16"
+        | `V3_17 -> "3.17"
       in
       match arch with `I386 -> ("i386/alpine", tag) | _ -> ("alpine", tag))
   | `Archlinux `Latest -> ("archlinux", "latest")

diff --git a/src-opam/distro.mli b/src-opam/distro.mli
@@ -94,7 +94,8 @@ type distro =
     | `V3_13
     | `V3_14
     | `V3_15
-    | `V3_16 ]
+    | `V3_16
+    | `V3_17 ]
   | `Archlinux of [ `Latest ]
   | `CentOS of [ `V6 | `V7 | `V8 ]
   | `Debian of [ `V11 | `V10 | `V9 | `V8 | `V7 | `Testing | `Unstable ]
@@ -158,6 +159,7 @@ type t =
     | `V3_14
     | `V3_15
     | `V3_16
+    | `V3_17
     | `Latest ]
   | `Archlinux of [ `Latest ]
   | `CentOS of [ `V6 | `V7 | `V8 | `Latest ]