From 59df30768d9a60394e5bbd7efb56cdd75039aa68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= Date: Thu, 2 Feb 2023 12:04:21 +0100 Subject: [PATCH 1/2] Update Bubblewarp version info curl 'https://repology.org/api/v1/project/bubblewrap' |\ jq -r '.[] | .repo + " " + .version' |\ grep 'ubuntu\|debian\|centos\|fedora\|alpine\|arch \|opensuse_leap' |\ grep -v 'alpine_edge\|centos_stream\|backports\|fedora_rawhide' |\ sort -u --- src-opam/distro.ml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src-opam/distro.ml b/src-opam/distro.ml index 608dce9a..334af7f5 100644 --- a/src-opam/distro.ml +++ b/src-opam/distro.ml @@ -1162,11 +1162,11 @@ let rec bubblewrap_version (t : t) = | `Ubuntu `V22_10 -> Some (0, 6, 2) | `Debian `V7 -> None (* Not actually checked *) | `Debian `V8 -> None (* Not actually checked *) - | `Debian `V9 -> Some (0, 3, 1) + | `Debian `V9 -> Some (0, 1, 7) | `Debian `V10 -> Some (0, 3, 1) | `Debian `V11 -> Some (0, 4, 1) - | `Debian `Testing -> Some (0, 5, 0) - | `Debian `Unstable -> Some (0, 5, 0) + | `Debian `Testing -> Some (0, 7, 0) + | `Debian `Unstable -> Some (0, 7, 0) | `CentOS `V6 -> None | `CentOS `V7 -> None | `CentOS `V8 -> Some (0, 4, 0) @@ -1202,8 +1202,8 @@ 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) + | `Alpine `V3_17 -> Some (0, 7, 0) + | `Archlinux `Latest -> Some (0, 7, 0) | `OpenSUSE `V42_1 -> None (* Not actually checked *) | `OpenSUSE `V42_2 -> None (* Not actually checked *) | `OpenSUSE `V42_3 -> None (* Not actually checked *) From f5218a605d542371ad358e315694d879754544ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= Date: Thu, 2 Feb 2023 12:11:40 +0100 Subject: [PATCH 2/2] Add OpenSUSE 15.4 released 2022-06-08 --- CHANGES.md | 1 + src-opam/distro.ml | 30 ++++++++++++++++++++++++------ src-opam/distro.mli | 13 +++++++++++-- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 36c2bafe..e736566b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,7 @@ unreleased ---------- +- Add OpenSUSE 15.4, deprecate OpenSUSE 15.3. (@MisterDA #138) - Update to bubblewrap 0.7.0. (@MisterDA #131) - Add Alpine 3.17 (3.16 is now tier 2 and 3.15 is deprecated). Remove libexecinfo-dev from the list of apk packages as it is no longer diff --git a/src-opam/distro.ml b/src-opam/distro.ml index 334af7f5..cec3d75b 100644 --- a/src-opam/distro.ml +++ b/src-opam/distro.ml @@ -250,7 +250,8 @@ type distro = | `V36 | `V37 ] | `OracleLinux of [ `V7 | `V8 ] - | `OpenSUSE of [ `V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 ] + | `OpenSUSE of + [ `V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 | `V15_4 ] | `Ubuntu of [ `V12_04 | `V14_04 @@ -316,7 +317,15 @@ type t = | `Latest ] | `OracleLinux of [ `V7 | `V8 | `Latest ] | `OpenSUSE of - [ `V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 | `Latest ] + [ `V42_1 + | `V42_2 + | `V42_3 + | `V15_0 + | `V15_1 + | `V15_2 + | `V15_3 + | `V15_4 + | `Latest ] | `Ubuntu of [ `V12_04 | `V14_04 @@ -432,6 +441,7 @@ let distros : t list = `OpenSUSE `V15_1; `OpenSUSE `V15_2; `OpenSUSE `V15_3; + `OpenSUSE `V15_4; `OpenSUSE `Latest; `Ubuntu `V12_04; `Ubuntu `V14_04; @@ -535,7 +545,7 @@ let resolve_alias (d : t) : distro = | `Debian `Stable -> `Debian `V11 | `Fedora `Latest -> `Fedora `V37 | `OracleLinux `Latest -> `OracleLinux `V8 - | `OpenSUSE `Latest -> `OpenSUSE `V15_3 + | `OpenSUSE `Latest -> `OpenSUSE `V15_4 | `Ubuntu `Latest -> `Ubuntu `V22_10 | `Ubuntu `LTS -> `Ubuntu `V22_04 | `Cygwin (#win10_ltsc as v) -> `Cygwin (resolve_ltsc v) @@ -550,7 +560,8 @@ let resolve_alias (d : t) : distro = ( `V21 | `V22 | `V23 | `V24 | `V25 | `V26 | `V27 | `V28 | `V29 | `V30 | `V31 | `V32 | `V33 | `V34 | `V35 | `V36 | `V37 ) | `OracleLinux (`V7 | `V8) - | `OpenSUSE (`V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3) + | `OpenSUSE + (`V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 | `V15_4) | `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 @@ -589,9 +600,10 @@ let distro_status (d : t) : status = `Deprecated | `Fedora (`V36 | `V37) -> `Active `Tier2 | `OracleLinux (`V7 | `V8) -> `Active `Tier3 - | `OpenSUSE (`V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2) -> + | `OpenSUSE (`V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3) + -> `Deprecated - | `OpenSUSE `V15_3 -> `Active `Tier2 + | `OpenSUSE `V15_4 -> `Active `Tier2 | `Ubuntu `V18_04 -> `Active `Tier3 | `Ubuntu (`V20_04 | `V22_04 | `V22_10) -> `Active `Tier2 | `Ubuntu @@ -758,6 +770,7 @@ let builtin_ocaml_of_distro (d : t) : string option = | `OpenSUSE `V15_1 -> Some "4.05.0" | `OpenSUSE `V15_2 -> Some "4.05.0" | `OpenSUSE `V15_3 -> Some "4.05.0" + | `OpenSUSE `V15_4 -> Some "4.05.0" | `OracleLinux `V7 -> Some "4.01.0" | `OracleLinux `V8 -> Some "4.07.0" | `Cygwin _ -> None @@ -913,6 +926,7 @@ let tag_of_distro (d : t) = | `OpenSUSE `V15_1 -> "opensuse-15.1" | `OpenSUSE `V15_2 -> "opensuse-15.2" | `OpenSUSE `V15_3 -> "opensuse-15.3" + | `OpenSUSE `V15_4 -> "opensuse-15.4" | `OpenSUSE `Latest -> "opensuse" | `Cygwin v -> "cygwin-" ^ win10_release_to_string v | `Windows (`Mingw, v) -> "windows-mingw-" ^ win10_release_to_string v @@ -1002,6 +1016,7 @@ let distro_of_tag x : t option = | "opensuse-15.1" -> Some (`OpenSUSE `V15_1) | "opensuse-15.2" -> Some (`OpenSUSE `V15_2) | "opensuse-15.3" -> Some (`OpenSUSE `V15_3) + | "opensuse-15.4" -> Some (`OpenSUSE `V15_4) | "opensuse" -> Some (`OpenSUSE `Latest) | s when String.is_prefix ~affix:"cygwin-" s -> win10_of_tag "cygwin-" s (fun v -> `Cygwin v) @@ -1085,6 +1100,7 @@ let human_readable_string_of_distro (d : t) = | `OpenSUSE `V15_1 -> "OpenSUSE 15.1 (Leap)" | `OpenSUSE `V15_2 -> "OpenSUSE 15.2 (Leap)" | `OpenSUSE `V15_3 -> "OpenSUSE 15.3 (Leap)" + | `OpenSUSE `V15_4 -> "OpenSUSE 15.4 (Leap)" | `Cygwin v -> "Cygwin " ^ win10_release_to_string v | `Windows (`Mingw, v) -> "Windows mingw " ^ win10_release_to_string v | `Windows (`Msvc, v) -> "Windows mingw " ^ win10_release_to_string v @@ -1211,6 +1227,7 @@ let rec bubblewrap_version (t : t) = | `OpenSUSE `V15_1 -> Some (0, 3, 3) | `OpenSUSE `V15_2 -> Some (0, 4, 1) | `OpenSUSE `V15_3 -> Some (0, 4, 1) + | `OpenSUSE `V15_4 -> Some (0, 4, 1) | `Cygwin _ -> None | `Windows _ -> None @@ -1325,6 +1342,7 @@ let base_distro_tag ?win10_revision ?(arch = `X86_64) d = | `V15_1 -> "15.1" | `V15_2 -> "15.2" | `V15_3 -> "15.3" + | `V15_4 -> "15.4" in ("opensuse/leap", tag) | `Cygwin v -> diff --git a/src-opam/distro.mli b/src-opam/distro.mli index 5345e48a..372f8f1a 100644 --- a/src-opam/distro.mli +++ b/src-opam/distro.mli @@ -120,7 +120,8 @@ type distro = | `V36 | `V37 ] | `OracleLinux of [ `V7 | `V8 ] - | `OpenSUSE of [ `V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 ] + | `OpenSUSE of + [ `V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 | `V15_4 ] | `Ubuntu of [ `V12_04 | `V14_04 @@ -187,7 +188,15 @@ type t = | `Latest ] | `OracleLinux of [ `V7 | `V8 | `Latest ] | `OpenSUSE of - [ `V42_1 | `V42_2 | `V42_3 | `V15_0 | `V15_1 | `V15_2 | `V15_3 | `Latest ] + [ `V42_1 + | `V42_2 + | `V42_3 + | `V15_0 + | `V15_1 + | `V15_2 + | `V15_3 + | `V15_4 + | `Latest ] | `Ubuntu of [ `V12_04 | `V14_04