From 572cef9a0f886fca339f313fdfdde42f3111c909 Mon Sep 17 00:00:00 2001 From: manavdesai27 Date: Mon, 19 Jul 2021 14:27:13 +0530 Subject: [PATCH] provision: Add support for Fedora 34. --- docs/development/setup-advanced.md | 2 +- scripts/lib/setup-yum-repo | 4 ++-- tools/lib/provision.py | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/development/setup-advanced.md b/docs/development/setup-advanced.md index de0b96b336..c37df21f39 100644 --- a/docs/development/setup-advanced.md +++ b/docs/development/setup-advanced.md @@ -16,7 +16,7 @@ that's running one of: * Ubuntu 20.04 Focal, 18.04 Bionic * Debian 10 Buster, 11 Bullseye (beta) * CentOS 7 (beta) -* Fedora 33 (beta) +* Fedora 33 and 34 (beta) * RHEL 7 (beta) You can just run the Zulip provision script on your machine. diff --git a/scripts/lib/setup-yum-repo b/scripts/lib/setup-yum-repo index e1f736d28d..3ddfd7efe8 100755 --- a/scripts/lib/setup-yum-repo +++ b/scripts/lib/setup-yum-repo @@ -53,7 +53,7 @@ elif [ "$is_rhel" = true ]; then yum localinstall -y https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-latest-x86_64/pgdg-redhat10-10-2.noarch.rpm yum localinstall -y https://packages.groonga.org/centos/groonga-release-latest.noarch.rpm else - # TODO only fedora33 for now + # TODO make the postgres version a variable. PGVER=13 - dnf install -y "https://download.postgresql.org/pub/repos/yum/reporpms/F-33-x86_64/pgdg-fedora-repo-latest.noarch.rpm" + dnf install -y "https://download.postgresql.org/pub/repos/yum/reporpms/F-$RHVER-x86_64/pgdg-fedora-repo-latest.noarch.rpm" fi diff --git a/tools/lib/provision.py b/tools/lib/provision.py index 974884ff06..3a753791e9 100755 --- a/tools/lib/provision.py +++ b/tools/lib/provision.py @@ -107,6 +107,8 @@ elif vendor == "neon" and os_version == "20.04": # KDE Neon POSTGRESQL_VERSION = "12" elif vendor == "fedora" and os_version == "33": POSTGRESQL_VERSION = "13" +elif vendor == "fedora" and os_version == "34": + POSTGRESQL_VERSION = "13" elif vendor == "rhel" and os_version.startswith("7."): POSTGRESQL_VERSION = "10" elif vendor == "centos" and os_version == "7":