paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 07:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

provision: Add provision support for Ubuntu 19.04

Browse Source 
This commit adds support for Ubuntu 19.04 in the development
environment.
This commit is contained in:
Amal Rajan
2019-06-21 11:29:38 +05:30
committed by Tim Abbott
parent 24d66477ca
commit 09049f1678
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@ Contents:
If you'd like to install a Zulip development environment on a computer 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 * Ubuntu 19.04 Disco, 18.10 Cosmic, 18.04 Bionic, 16.04 Xenial
* Debian 9 Stretch or 10 Buster * Debian 9 Stretch or 10 Buster
* Centos 7 (beta) * Centos 7 (beta)
* Fedora 29 (beta) * Fedora 29 (beta)

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

@@ -45,7 +45,7 @@ deb http://ppa.launchpad.net/tabbott/zulip/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
deb-src http://ppa.launchpad.net/tabbott/zulip/ubuntu $release main deb-src http://ppa.launchpad.net/tabbott/zulip/ubuntu $release main
EOF EOF
elif [ "$release" = "cosmic" ]; then elif [ "$release" = "cosmic" ] || [ "$release" = "disco" ]; then
# This case will eventually merge with the above, if/when we add # This case will eventually merge with the above, if/when we add
# tsearch_extras packages to the Zulip PPA. # tsearch_extras packages to the Zulip PPA.
apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc

4
tools/lib/provision.py
View File

@@ -36,6 +36,7 @@ SUPPORTED_PLATFORMS = {
"xenial", "xenial",
"bionic", "bionic",
"cosmic", "cosmic",
"disco",
], ],
"Debian": [ "Debian": [
"stretch", "stretch",
@@ -143,6 +144,7 @@ POSTGRES_VERSION_MAP = {
"xenial": "9.5", "xenial": "9.5",
"bionic": "10", "bionic": "10",
"cosmic": "10", "cosmic": "10",
"disco": "11",
"centos7": "10", "centos7": "10",
"fedora29": "10", "fedora29": "10",
"rhel7": "10", "rhel7": "10",
@@ -187,7 +189,7 @@ COMMON_YUM_DEPENDENCIES = COMMON_DEPENDENCIES + [
BUILD_TSEARCH_FROM_SOURCE = False BUILD_TSEARCH_FROM_SOURCE = False
BUILD_PGROONGA_FROM_SOURCE = False BUILD_PGROONGA_FROM_SOURCE = False
if vendor in ["Ubuntu", "Debian"]: if vendor in ["Ubuntu", "Debian"]:
if codename == "cosmic": if codename in ("cosmic", "disco"):
# For platforms without a tsearch-extras package distributed # For platforms without a tsearch-extras package distributed
# from our PPA, we need to build from source. # from our PPA, we need to build from source.
BUILD_TSEARCH_FROM_SOURCE = True BUILD_TSEARCH_FROM_SOURCE = True