Add Alpine 3.18 (#167)

Author: MisterDA

CHANGES.md

@@ -1,8 +1,9 @@
 unreleased
 ----------
 
+- Add Alpine 3.18. (@MisterDA #167)
 - Support opam new `--with-vendored-deps` configure option. (@MisterDA #165)
-- Rework Windows images and update their dependencies:
+- Rework Windows images and update their dependencies. (@MisterDA #162)
   + Fix the origin of Install.cmd (avsm -> ocurrent);
   + Rename Windows.Cygwin.install_from_release to install_cygwin;
   + Rework Cygwin package list needed for opam and OCaml for Windows;
@@ -13,8 +14,7 @@ unreleased
   + Track msvs-tools master;
   + Split MSVC build into multiple build steps;
   + Internal refactors.
-  (@MisterDA #162)
-- Added Ubuntu 23.04 and Fedora 38. (@mtelvers #164)
+- Add Ubuntu 23.04 and Fedora 38. (@mtelvers #164)
 - Add newlines in some cases for better formatting.
   (@MisterDA #161, review by @benmandrew)
 - Various LCU Updates. (@mtelvers #160)

src-opam/distro.ml

@@ -251,7 +251,8 @@ type distro =
     | `V3_14
     | `V3_15
     | `V3_16
-    | `V3_17 ]
+    | `V3_17
+    | `V3_18 ]
   | `Archlinux of [ `Latest ]
   | `CentOS of [ `V6 | `V7 | `V8 ]
   | `Debian of [ `V11 | `V10 | `V9 | `V8 | `V7 | `Testing | `Unstable ]
@@ -318,6 +319,7 @@ type t =
     | `V3_15
     | `V3_16
     | `V3_17
+    | `V3_18
     | `Latest ]
   | `Archlinux of [ `Latest ]
   | `CentOS of [ `V6 | `V7 | `V8 | `Latest ]
@@ -429,6 +431,7 @@ let distros : t list =
     `Alpine `V3_15;
     `Alpine `V3_16;
     `Alpine `V3_17;
+    `Alpine `V3_18;
     `Alpine `Latest;
     `Archlinux `Latest;
     `CentOS `V6;
@@ -571,7 +574,7 @@ let win10_latest_image = `V21H2
 
 let resolve_alias (d : t) : distro =
   match d with
-  | `Alpine `Latest -> `Alpine `V3_17
+  | `Alpine `Latest -> `Alpine `V3_18
   | `CentOS `Latest -> `CentOS `V7
   | `Debian `Stable -> `Debian `V11
   | `Fedora `Latest -> `Fedora `V38
@@ -583,7 +586,8 @@ 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_17 )
+        | `V3_11 | `V3_12 | `V3_13 | `V3_14 | `V3_15 | `V3_16 | `V3_17 | `V3_18
+          )
     | `Archlinux `Latest
     | `CentOS (`V6 | `V7 | `V8)
     | `Debian (`V7 | `V8 | `V9 | `V10 | `V11 | `Testing | `Unstable)
@@ -616,7 +620,8 @@ let distro_status (d : t) : status =
         | `V3_11 | `V3_12 | `V3_13 | `V3_14 | `V3_15 ) ->
         `Deprecated
     | `Alpine `V3_16 -> `Active `Tier2
-    | `Alpine `V3_17 -> `Active `Tier1
+    | `Alpine `V3_17 -> `Active `Tier2
+    | `Alpine `V3_18 -> `Active `Tier1
     | `Archlinux `Latest -> `Active `Tier3
     | `CentOS `V7 -> `Active `Tier3
     | `CentOS (`V6 | `V8) -> `Deprecated
@@ -683,7 +688,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_17 ),
+        | `V3_14 | `V3_15 | `V3_16 | `V3_17 | `V3_18 ),
       ov )
     when OV.(compare Releases.v4_05_0 ov) = -1 ->
       [ `X86_64; `Aarch64 ]
@@ -780,6 +785,7 @@ let builtin_ocaml_of_distro (d : t) : string option =
   | `Alpine `V3_15 -> Some "4.13.1"
   | `Alpine `V3_16 -> Some "4.14.0"
   | `Alpine `V3_17 -> Some "4.14.0"
+  | `Alpine `V3_18 -> Some "4.14.1"
   | `Archlinux `Latest -> Some "4.11.1"
   | `Fedora `V21 -> Some "4.01.0"
   | `Fedora `V22 -> Some "4.02.0"
@@ -960,6 +966,7 @@ let tag_of_distro (d : t) =
   | `Alpine `V3_15 -> "alpine-3.15"
   | `Alpine `V3_16 -> "alpine-3.16"
   | `Alpine `V3_17 -> "alpine-3.17"
+  | `Alpine `V3_18 -> "alpine-3.18"
   | `Alpine `Latest -> "alpine"
   | `Archlinux `Latest -> "archlinux"
   | `OpenSUSE `V42_1 -> "opensuse-42.1"
@@ -1051,6 +1058,7 @@ let distro_of_tag x : t option =
   | "alpine-3.15" -> Some (`Alpine `V3_15)
   | "alpine-3.16" -> Some (`Alpine `V3_16)
   | "alpine-3.17" -> Some (`Alpine `V3_17)
+  | "alpine-3.18" -> Some (`Alpine `V3_18)
   | "alpine" -> Some (`Alpine `Latest)
   | "archlinux" -> Some (`Archlinux `Latest)
   | "opensuse-42.1" -> Some (`OpenSUSE `V42_1)
@@ -1139,6 +1147,7 @@ let human_readable_string_of_distro (d : t) =
     | `Alpine `V3_15 -> "Alpine 3.15"
     | `Alpine `V3_16 -> "Alpine 3.16"
     | `Alpine `V3_17 -> "Alpine 3.17"
+    | `Alpine `V3_18 -> "Alpine 3.18"
     | `Archlinux `Latest -> "Archlinux"
     | `OpenSUSE `V42_1 -> "OpenSUSE 42.1"
     | `OpenSUSE `V42_2 -> "OpenSUSE 42.2"
@@ -1270,6 +1279,7 @@ let bubblewrap_version (t : t) =
   | `Alpine `V3_15 -> Some (0, 5, 0)
   | `Alpine `V3_16 -> Some (0, 6, 2)
   | `Alpine `V3_17 -> Some (0, 7, 0)
+  | `Alpine `V3_18 -> Some (0, 8, 0)
   | `Archlinux `Latest -> Some (0, 8, 0)
   | `OpenSUSE `V42_1 -> None (* Not actually checked *)
   | `OpenSUSE `V42_2 -> None (* Not actually checked *)
@@ -1312,6 +1322,7 @@ let base_distro_tag ?win10_revision ?(arch = `X86_64) d =
         | `V3_15 -> "3.15"
         | `V3_16 -> "3.16"
         | `V3_17 -> "3.17"
+        | `V3_18 -> "3.18"
       in
       match arch with `I386 -> ("i386/alpine", tag) | _ -> ("alpine", tag))
   | `Archlinux `Latest -> ("archlinux", "latest")

src-opam/distro.mli

@@ -101,7 +101,8 @@ type distro =
     | `V3_14
     | `V3_15
     | `V3_16
-    | `V3_17 ]
+    | `V3_17
+    | `V3_18 ]
   | `Archlinux of [ `Latest ]
   | `CentOS of [ `V6 | `V7 | `V8 ]
   | `Debian of [ `V11 | `V10 | `V9 | `V8 | `V7 | `Testing | `Unstable ]
@@ -169,6 +170,7 @@ type t =
     | `V3_15
     | `V3_16
     | `V3_17
+    | `V3_18
     | `Latest ]
   | `Archlinux of [ `Latest ]
   | `CentOS of [ `V6 | `V7 | `V8 | `Latest ]