mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-03 21:43:21 +00:00 
			
		
		
		
	provision: Added provision support for Ubuntu 20.04(Focal).
Groonga does not have a ppa package for Focal yet so pgroonga is built from the source. Postgres 12 is used when os_version is 20.04.
This commit is contained in:
		@@ -2,7 +2,7 @@
 | 
			
		||||
set -x
 | 
			
		||||
set -e
 | 
			
		||||
 | 
			
		||||
PGROONGA_VERSION="2.1.8"
 | 
			
		||||
PGROONGA_VERSION="2.2.3"
 | 
			
		||||
 | 
			
		||||
cd "$(mktemp -d)"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -42,6 +42,8 @@ if [[ "$release" =~ ^(xenial|bionic|cosmic|disco|eoan)$ ]] ; then
 | 
			
		||||
deb http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
 | 
			
		||||
deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
 | 
			
		||||
EOF
 | 
			
		||||
elif [[ "$release" =~ ^(focal)$ ]] ; then
 | 
			
		||||
    echo "Currently Groonga do not have a ppa package for Focal so we need to build pgroonga from the source"
 | 
			
		||||
elif [[ "$release" =~ ^(stretch|buster)$ ]] ; then
 | 
			
		||||
    apt-key add "$SCRIPTS_PATH"/setup/pgroonga-debian.asc
 | 
			
		||||
    cat >$SOURCES_FILE <<EOF
 | 
			
		||||
 
 | 
			
		||||
@@ -92,6 +92,8 @@ elif vendor == "ubuntu" and os_version in ["18.04", "18.10"]:  # bionic, cosmic
 | 
			
		||||
    POSTGRES_VERSION = "10"
 | 
			
		||||
elif vendor == "ubuntu" and os_version in ["19.04", "19.10"]:  # disco, eoan
 | 
			
		||||
    POSTGRES_VERSION = "11"
 | 
			
		||||
elif vendor == "ubuntu" and os_version == "20.04":  # focal
 | 
			
		||||
    POSTGRES_VERSION = "12"
 | 
			
		||||
elif vendor == "fedora" and os_version == "29":
 | 
			
		||||
    POSTGRES_VERSION = "10"
 | 
			
		||||
elif vendor == "rhel" and os_version.startswith("7."):
 | 
			
		||||
@@ -146,7 +148,7 @@ COMMON_YUM_DEPENDENCIES = COMMON_DEPENDENCIES + [
 | 
			
		||||
] + YUM_THUMBOR_VENV_DEPENDENCIES
 | 
			
		||||
 | 
			
		||||
BUILD_PGROONGA_FROM_SOURCE = False
 | 
			
		||||
if vendor == 'debian' and os_version in []:
 | 
			
		||||
if vendor == 'debian' and os_version in [] or vendor == 'ubuntu' and os_version in ['20.04']:
 | 
			
		||||
    # For platforms without a pgroonga release, we need to build it
 | 
			
		||||
    # from source.
 | 
			
		||||
    BUILD_PGROONGA_FROM_SOURCE = True
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user