diff --git a/CHANGES.md b/CHANGES.md index dab89245..77f14148 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,7 +9,7 @@ unreleased (@MisterDA #140, #142, #143) - Include the ocaml-beta-repository in the images. (@kit-ty-kate #132, review by @MisterDA) - Add OpenSUSE 15.4, deprecate OpenSUSE 15.3. (@MisterDA #138) -- Update to bubblewrap 0.7.0. (@MisterDA #131) +- Update to bubblewrap 0.8.0. (@MisterDA #131 #148) - 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 available. Its symbols are only used in OCaml's self tests. diff --git a/contrib/bubblewrap.sh b/contrib/bubblewrap.sh new file mode 100755 index 00000000..82e137db --- /dev/null +++ b/contrib/bubblewrap.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env sh + +# Use repology.org to retrieve the version of Bubblewrap in Linux +# distributions we're tracking. Missing CentOS and OracleLinux. + +command -v curl >/dev/null || exit +command -v jq >/dev/null || exit + +curl -Ls 'https://repology.org/api/v1/project/bubblewrap' | \ + jq 'map(select(.repo | test("^(debian_1\\d$)|ubuntu_2|arch$|alpine_3_1[^0-5]|opensuse_leap_15_[^0-3]|fedora_3[^0-5]")) | {repo, origversion}) | unique | sort_by(.repo)' diff --git a/src-opam/distro.ml b/src-opam/distro.ml index ab71ec1f..1ca1b03f 100644 --- a/src-opam/distro.ml +++ b/src-opam/distro.ml @@ -1228,7 +1228,7 @@ let rec 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) - | `Archlinux `Latest -> Some (0, 7, 0) + | `Archlinux `Latest -> Some (0, 8, 0) | `OpenSUSE `V42_1 -> None (* Not actually checked *) | `OpenSUSE `V42_2 -> None (* Not actually checked *) | `OpenSUSE `V42_3 -> None (* Not actually checked *) diff --git a/src-opam/opam.ml b/src-opam/opam.ml index 241b6804..98b2edc8 100644 --- a/src-opam/opam.ml +++ b/src-opam/opam.ml @@ -70,7 +70,7 @@ let install_opam_from_source_windows ?cyg ?prefix {|cd /usr/local/bin && tar -cf /cygdrive/c/opam.tar .|} let bubblewrap_minimum = (0, 4, 1) -let bubblewrap_latest = (0, 7, 0) +let bubblewrap_latest = (0, 8, 0) let maybe_build_bubblewrap_from_source ?(prefix = "/usr/local") distro = match D.bubblewrap_version distro with