diff --git a/docs/development/setup-advanced.md b/docs/development/setup-advanced.md index b94cc0a4f4..1c0618389d 100644 --- a/docs/development/setup-advanced.md +++ b/docs/development/setup-advanced.md @@ -11,7 +11,7 @@ Contents: If you'd like to install a Zulip development environment on a computer 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 * Centos 7 (beta) * Fedora 29 (beta) diff --git a/scripts/lib/setup-apt-repo b/scripts/lib/setup-apt-repo index 50be821fe7..ef0406e7b2 100755 --- a/scripts/lib/setup-apt-repo +++ b/scripts/lib/setup-apt-repo @@ -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/tabbott/zulip/ubuntu $release main EOF -elif [ "$release" = "cosmic" ]; then +elif [ "$release" = "cosmic" ] || [ "$release" = "disco" ]; then # This case will eventually merge with the above, if/when we add # tsearch_extras packages to the Zulip PPA. apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc diff --git a/tools/lib/provision.py b/tools/lib/provision.py index 744a75c832..154e70031b 100755 --- a/tools/lib/provision.py +++ b/tools/lib/provision.py @@ -36,6 +36,7 @@ SUPPORTED_PLATFORMS = { "xenial", "bionic", "cosmic", + "disco", ], "Debian": [ "stretch", @@ -143,6 +144,7 @@ POSTGRES_VERSION_MAP = { "xenial": "9.5", "bionic": "10", "cosmic": "10", + "disco": "11", "centos7": "10", "fedora29": "10", "rhel7": "10", @@ -187,7 +189,7 @@ COMMON_YUM_DEPENDENCIES = COMMON_DEPENDENCIES + [ BUILD_TSEARCH_FROM_SOURCE = False BUILD_PGROONGA_FROM_SOURCE = False if vendor in ["Ubuntu", "Debian"]: - if codename == "cosmic": + if codename in ("cosmic", "disco"): # For platforms without a tsearch-extras package distributed # from our PPA, we need to build from source. BUILD_TSEARCH_FROM_SOURCE = True