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

provisioning: Support Ubuntu 19.10 eoan. 

This adds Ubuntu 19.10 as a valid provisioning target.

The release test in setup-apt-repo was changed from a list of values to
a regex check for brevity.
This commit is contained in:
Chris Heald 2020-02-12 10:56:42 -07:00 committed by GitHub
parent 973c6a3061
commit 2ca447c1a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,13 +36,13 @@ 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" ] || [ "$release" = "bionic" ] || [ "$release" = "cosmic" ] || [ "$release" = "disco" ]; then if [[ "$release" =~ ^(xenial|bionic|cosmic|disco|eoan)$ ]] ; 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" = "stretch" ] || [ "$release" = "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
deb https://packages.groonga.org/debian/ $release main deb https://packages.groonga.org/debian/ $release main

2
tools/lib/provision.py
View File

@ -91,7 +91,7 @@ elif vendor == "ubuntu" and os_version == "16.04": # xenial
POSTGRES_VERSION = "9.5" POSTGRES_VERSION = "9.5"
elif vendor == "ubuntu" and os_version in ["18.04", "18.10"]: # bionic, cosmic elif vendor == "ubuntu" and os_version in ["18.04", "18.10"]: # bionic, cosmic
POSTGRES_VERSION = "10" POSTGRES_VERSION = "10"
elif vendor == "ubuntu" and os_version == "19.04": # disco elif vendor == "ubuntu" and os_version in ["19.04", "19.10"]: # disco, eoan
POSTGRES_VERSION = "11" POSTGRES_VERSION = "11"
elif vendor == "fedora" and os_version == "29": elif vendor == "fedora" and os_version == "29":
POSTGRES_VERSION = "10" POSTGRES_VERSION = "10"