Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2024-08-29 15:35:43 -07:00 committed by Anders Kaseorg
parent e4f1156bea
commit 8b147d92a8
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/setup/apt-repos/zulip/custom.sh
View File

@ -27,10 +27,6 @@ if [[ ! -e /usr/share/doc/groonga-apt-source/copyright ]]; then
read -r release read -r release
} <<<"$os_info" } <<<"$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="groonga-apt-source-latest-$release.deb"
groonga_apt_source_deb_sign="$groonga_apt_source_deb.asc.$pgroonga_apt_sign_key_fingerprint" 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" curl -fLO --retry 3 "https://packages.groonga.org/$distribution/$groonga_apt_source_deb"

3
scripts/setup/apt-repos/zulip/noble.list
View File

@ -1,2 +1,5 @@
deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main
deb-src 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

2
tools/lib/provision.py
View File

@ -149,7 +149,7 @@ COMMON_YUM_DEPENDENCIES = [
BUILD_GROONGA_FROM_SOURCE = False BUILD_GROONGA_FROM_SOURCE = False
BUILD_PGROONGA_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 # For platforms without a PGroonga release, we need to build it
# from source. # from source.
BUILD_PGROONGA_FROM_SOURCE = True BUILD_PGROONGA_FROM_SOURCE = True