From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
To: Alexander Turenko <alexander.turenko@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v2] build: add Fedora 31 into CI / CD
Date: Tue, 3 Dec 2019 08:59:43 +0300 [thread overview]
Message-ID: <59a36acd7f2aade804e189ee7b403802afaabf48.1575352693.git.avtikhon@tarantool.org> (raw)
Added build + test jobs in GitLab-CI and build + test + deploy jobs on
Travis-CI for Fedora 31.
Updated testing dependencies in the RPM spec to follow the new Python 2
package naming scheme that was introduced in Fedora 31: it uses
python2-' prefix rather then 'python-'.
Fedora 31 does not provide python2-gevent and python2-greenlet packages,
so they were pushed to https://packagecloud.io/packpack/backports
repository. This repository is enabled in our build image
(packpack/packpack:fedora-31) by default. Those dependencies are build-time,
so nothing was changed for a user. The source RPM packages were gathered
from https://rpms.remirepo.net/rpmphp/.
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 edce39115..ff95ed646 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -76,7 +76,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
next reply other threads:[~2019-12-03 5:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-03 5:59 Alexander V. Tikhonov [this message]
2019-12-05 11:03 ` Alexander Turenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=59a36acd7f2aade804e189ee7b403802afaabf48.1575352693.git.avtikhon@tarantool.org \
--to=avtikhon@tarantool.org \
--cc=alexander.turenko@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v2] build: add Fedora 31 into CI / CD' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox