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

provision: switch Focal to use PGroonga from PPA. 

Since Groonga packages for Ubuntu 20.04 Focal are now available
in their ppa so stopped building pgroonga from source.
This commit is contained in:
arpit551 2020-03-31 23:35:18 +05:30 committed by Tim Abbott
parent 9d75eb0ad5
commit a2dd1fad12
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/lib/setup-apt-repo
View File

@ -36,14 +36,12 @@ apt-get -y install "${pre_setup_deps[@]}"
SCRIPTS_PATH="$(dirname "$(dirname "$0")")" SCRIPTS_PATH="$(dirname "$(dirname "$0")")"
release=$(lsb_release -sc) release=$(lsb_release -sc)
if [[ "$release" =~ ^(xenial|bionic|cosmic|disco|eoan)$ ]] ; then if [[ "$release" =~ ^(xenial|bionic|cosmic|disco|eoan|focal)$ ]] ; then
apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc
cat >$SOURCES_FILE <<EOF cat >$SOURCES_FILE <<EOF
deb http://ppa.launchpad.net/groonga/ppa/ubuntu $release main deb http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu $release main deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
EOF EOF
elif [[ "$release" =~ ^(focal)$ ]] ; then
echo "Currently Groonga do not have a ppa package for Focal so we need to build pgroonga from the source"
elif [[ "$release" =~ ^(stretch|buster)$ ]] ; then elif [[ "$release" =~ ^(stretch|buster)$ ]] ; then
apt-key add "$SCRIPTS_PATH"/setup/pgroonga-debian.asc apt-key add "$SCRIPTS_PATH"/setup/pgroonga-debian.asc
cat >$SOURCES_FILE <<EOF cat >$SOURCES_FILE <<EOF

2
tools/lib/provision.py
View File

@ -160,7 +160,7 @@ COMMON_YUM_DEPENDENCIES = COMMON_DEPENDENCIES + [
] + YUM_THUMBOR_VENV_DEPENDENCIES ] + YUM_THUMBOR_VENV_DEPENDENCIES
BUILD_PGROONGA_FROM_SOURCE = False BUILD_PGROONGA_FROM_SOURCE = False
if vendor == 'debian' and os_version in [] or vendor == 'ubuntu' and os_version in ['20.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