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

provision: Add support for Debian 10 Buster.

This commit is contained in:
Mayank Madan 2019-04-26 03:37:24 +05:30 committed by Tim Abbott
parent aae01f5795
commit 99414e2d96
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/development/setup-advanced.md
View File

@ -13,7 +13,7 @@ If you'd like to install a Zulip development environment on a computer
that's running one of: that's running one of:
* Ubuntu 18.10 Cosmic, 18.04 Bionic, 16.04 Xenial, 14.04 Trusty * Ubuntu 18.10 Cosmic, 18.04 Bionic, 16.04 Xenial, 14.04 Trusty
* Debian 9 Stretch * Debian 9 Stretch or 10 Buster
* Centos 7 (beta) * Centos 7 (beta)
* Fedora 29 (beta) * Fedora 29 (beta)
* RHEL 7 (beta) * RHEL 7 (beta)

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

@ -49,14 +49,14 @@ elif [ "$release" = "cosmic" ]; then
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" = "stretch" ]; then elif [ "$release" = "stretch" ] || [ "$release" = "buster" ]; then
apt-get install -y debian-archive-keyring apt-get install -y debian-archive-keyring
apt-key add "$SCRIPTS_PATH"/setup/packagecloud.asc apt-key add "$SCRIPTS_PATH"/setup/packagecloud.asc
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
deb https://packagecloud.io/zulip/server/debian/ stretch main deb https://packagecloud.io/zulip/server/debian/ $release main
deb https://packages.groonga.org/debian/ stretch main deb https://packages.groonga.org/debian/ $release main
deb-src https://packages.groonga.org/debian/ stretch main deb-src https://packages.groonga.org/debian/ $release main
EOF EOF
else else
echo "Unsupported release $release." echo "Unsupported release $release."

18
tools/lib/provision.py
View File

@ -39,6 +39,7 @@ SUPPORTED_PLATFORMS = {
], ],
"Debian": [ "Debian": [
"stretch", "stretch",
"buster",
], ],
"CentOS": [ "CentOS": [
"centos7", "centos7",
@ -128,6 +129,7 @@ if not (vendor in SUPPORTED_PLATFORMS and codename in SUPPORTED_PLATFORMS[vendor
POSTGRES_VERSION_MAP = { POSTGRES_VERSION_MAP = {
"stretch": "9.6", "stretch": "9.6",
"buster": "11",
"trusty": "9.3", "trusty": "9.3",
"xenial": "9.5", "xenial": "9.5",
"bionic": "10", "bionic": "10",
@ -189,6 +191,22 @@ if vendor in ["Ubuntu", "Debian"]:
"postgresql-server-dev-{0}", "postgresql-server-dev-{0}",
] ]
] ]
elif codename == "buster":
# For platforms without a tsearch-extras package distributed
# from our PPA or a pgroonga release, we need to build both
# from source.
BUILD_PGROONGA_FROM_SOURCE = True
BUILD_TSEARCH_FROM_SOURCE = True
SYSTEM_DEPENDENCIES = UBUNTU_COMMON_APT_DEPENDENCIES + [
pkg.format(POSTGRES_VERSION) for pkg in [
"postgresql-{0}",
# Dependency for building tsearch_extras from source
"postgresql-server-dev-{0}",
# Dependency for building pgroonga from source
"libgroonga-dev",
"libmsgpack-dev",
]
]
else: else:
SYSTEM_DEPENDENCIES = UBUNTU_COMMON_APT_DEPENDENCIES + [ SYSTEM_DEPENDENCIES = UBUNTU_COMMON_APT_DEPENDENCIES + [
pkg.format(POSTGRES_VERSION) for pkg in [ pkg.format(POSTGRES_VERSION) for pkg in [