From 8b147d92a836892f8701cd25678d842e7e6db02f Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 29 Aug 2024 15:35:43 -0700 Subject: [PATCH] apt-repos: Use PGroonga binaries on Ubuntu 24.04. These did not exist when we first added Ubuntu 24.04 support; now they do. Fixes #31261. Signed-off-by: Anders Kaseorg --- scripts/setup/apt-repos/zulip/custom.sh | 4 ---- scripts/setup/apt-repos/zulip/noble.list | 3 +++ tools/lib/provision.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/setup/apt-repos/zulip/custom.sh b/scripts/setup/apt-repos/zulip/custom.sh index c665f016c9..ee363c7d65 100755 --- a/scripts/setup/apt-repos/zulip/custom.sh +++ b/scripts/setup/apt-repos/zulip/custom.sh @@ -27,10 +27,6 @@ if [[ ! -e /usr/share/doc/groonga-apt-source/copyright ]]; then read -r release } <<<"$os_info" - if [ "$distribution" = ubuntu ] && [ "$release" = noble ]; then - # PGroonga binaries are not yet provided for Ubuntu 24.04. - exit - fi groonga_apt_source_deb="groonga-apt-source-latest-$release.deb" groonga_apt_source_deb_sign="$groonga_apt_source_deb.asc.$pgroonga_apt_sign_key_fingerprint" curl -fLO --retry 3 "https://packages.groonga.org/$distribution/$groonga_apt_source_deb" diff --git a/scripts/setup/apt-repos/zulip/noble.list b/scripts/setup/apt-repos/zulip/noble.list index 9fdcfb3a7c..e2708ee9ae 100644 --- a/scripts/setup/apt-repos/zulip/noble.list +++ b/scripts/setup/apt-repos/zulip/noble.list @@ -1,2 +1,5 @@ deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main deb-src http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main + +deb http://ppa.launchpad.net/groonga/ppa/ubuntu noble main +deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu noble main diff --git a/tools/lib/provision.py b/tools/lib/provision.py index 7ec4045d7b..77a5c3377f 100755 --- a/tools/lib/provision.py +++ b/tools/lib/provision.py @@ -149,7 +149,7 @@ COMMON_YUM_DEPENDENCIES = [ BUILD_GROONGA_FROM_SOURCE = False BUILD_PGROONGA_FROM_SOURCE = False -if (vendor == "debian" and os_version in []) or (vendor == "ubuntu" and os_version in ["24.04"]): +if (vendor == "debian" and os_version in []) or (vendor == "ubuntu" and os_version in []): # For platforms without a PGroonga release, we need to build it # from source. BUILD_PGROONGA_FROM_SOURCE = True