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

provision: Partially add zesty to supported systems. 

We can't fully support it until we fix the tsearch_extras availability
issue, but for now, this is an improvement.

Tweaked by tabbott to cover the outstanding tsearch_extras issue.
This commit is contained in:
Anirudh Jain 2017-07-30 17:07:57 +05:30 committed by Tim Abbott
parent d3f0d2cc9f
commit 28944b6c94
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ apt-key add "$SCRIPTS_PATH"/setup/zulip-ppa.asc
apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc
release=$(lsb_release -sc)
if [ "$release" = "trusty" ] || [ "$release" = "xenial" ]; then
if [ "$release" = "trusty" ] || [ "$release" = "xenial" ] || [ "$release" = "zesty" ]; then
cat >/etc/apt/sources.list.d/zulip.list <<EOF
deb http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
deb http://ppa.launchpad.net/tabbott/zulip/ubuntu $release main

9
tools/lib/provision.py
View File

@ -29,6 +29,9 @@ SUPPORTED_PLATFORMS = {
"Ubuntu": [
"trusty",
"xenial",
# Platforms that are blocked on on tsearch_extras
# "stretch",
# "zesty",
],
}
@ -107,6 +110,7 @@ POSTGRES_VERSION_MAP = {
"stretch": "9.6",
"trusty": "9.3",
"xenial": "9.5",
"zesty": "9.6",
}
POSTGRES_VERSION = POSTGRES_VERSION_MAP[codename]
@ -149,6 +153,11 @@ APT_DEPENDENCIES = {
"postgresql-9.5-tsearch-extras",
"postgresql-9.5-pgroonga",
],
"zesty": UBUNTU_COMMON_APT_DEPENDENCIES + [
"postgresql-9.6",
"postgresql-9.6-pgroonga",
"virtualenv",
],
}
TSEARCH_STOPWORDS_PATH = "/usr/share/postgresql/%s/tsearch_data/" % (POSTGRES_VERSION,)