From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 131FA452566 for ; Tue, 5 Nov 2019 10:15:01 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Tue, 5 Nov 2019 10:14:59 +0300 Message-Id: Subject: [Tarantool-patches] [PATCH v1] build: enable Fedora 31 packaging List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Turenko Cc: tarantool-patches@freelists.org, tarantool-patches@dev.tarantool.org Enabled packages build rules for Fedora 31. For now Fedora 31 uses 'python2-' prefix for Python 2 modules rather the 'python-' as CentOS 8. Found that old packages like python-gevent was completely removed from Fedora 31 as at CentOS 8. To fix it the sources if these packages were downloaded from https://rpms.remirepo.net/rpmphp/ and rebuilt, to make them available the binaries were saved at the PackageCloud packpack backport repository. Added Fedora 31 into regular testing at gitlab-ci and travis-ci. Closes #4612 --- Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4612-fedora31-full-ci Issue: https://github.com/tarantool/tarantool/issues/4612 .gitlab-ci.yml | 6 ++++++ .travis.yml | 3 +++ rpm/tarantool.spec | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf13c382e..3af5a3c8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -176,6 +176,12 @@ fedora_30: OS: 'fedora' DIST: '30' +fedora_31: + <<: *deploy_test_definition + variables: + OS: 'fedora' + DIST: '31' + ubuntu_14_04: <<: *deploy_definition variables: diff --git a/.travis.yml b/.travis.yml index d48ef39e0..c2ace2eda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,9 @@ jobs: - name: "Fedora 30 build + test + deploy RPM" env: OS=fedora DIST=30 if: branch = "master" + - name: "Fedora 31 build + test + deploy RPM" + env: OS=fedora DIST=31 + if: branch = "master" - name: "Ubuntu Trusty (14.04) build + deploy DEB" env: OS=ubuntu DIST=trusty if: branch = "master" diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index 416b4ebb4..00fe61dd1 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -69,7 +69,7 @@ BuildRequires: python-six >= 1.9.0 BuildRequires: python-gevent >= 1.0 BuildRequires: python-yaml >= 3.0.9 %endif -%if (0%{?rhel} >= 8) +%if (0%{?fedora} >= 31 || 0%{?rhel} >= 8) BuildRequires: python2 >= 2.7 BuildRequires: python2-six >= 1.9.0 BuildRequires: python2-gevent >= 1.0 -- 2.17.1