From 1038ea118cd0f83d1b4d0438044f2574b1b87147 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Tue, 9 Feb 2016 20:02:57 +0300
Subject: [PATCH] Update the list of supported OS for tarantool/build
---
.travis.yml | 50 ++++++++++++++++++++++++++--------------------
rpm/tarantool.spec | 3 +++
2 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 7eee97935e..ffab6c7af8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,88 +15,94 @@ env:
matrix:
- OS=el DIST=6 PACK=rpm
- OS=el DIST=7 PACK=rpm
- - OS=fedora DIST=20 PACK=rpm
- - OS=fedora DIST=21 PACK=rpm
- OS=fedora DIST=22 PACK=rpm
- OS=fedora DIST=23 PACK=rpm
+ - OS=fedora DIST=rawhide PACK=rpm
- OS=ubuntu DIST=trusty PACK=deb
- OS=ubuntu DIST=precise PACK=deb
- - OS=ubuntu DIST=vivid PACK=deb
+ - OS=ubuntu DIST=wily PACK=deb
+ - OS=ubuntu DIST=xenial PACK=deb
- OS=debian DIST=jessie PACK=deb
- OS=debian DIST=wheezy PACK=deb
- OS=debian DIST=stretch PACK=deb
+ - OS=debian DIST=sid PACK=deb
- PACK=none
matrix:
allow_failures:
- env: OS=el DIST=6 PACK=rpm
- env: OS=el DIST=7 PACK=rpm
- - env: OS=fedora DIST=20 PACK=rpm
- - env: OS=fedora DIST=21 PACK=rpm
- env: OS=fedora DIST=22 PACK=rpm
- env: OS=fedora DIST=23 PACK=rpm
- - env: OS=ubuntu DIST=trusty PACK=deb
+ - env: OS=fedora DIST=rawhide PACK=rpm
- env: OS=ubuntu DIST=precise PACK=deb
- - env: OS=ubuntu DIST=vivid PACK=deb
+ - env: OS=ubuntu DIST=trusty PACK=deb
+ - env: OS=ubuntu DIST=wily PACK=deb
+ - env: OS=ubuntu DIST=xenial PACK=deb
- env: OS=debian DIST=jessie PACK=deb
- env: OS=debian DIST=wheezy PACK=deb
- env: OS=debian DIST=stretch PACK=deb
+ - env: OS=debian DIST=sid PACK=deb
exclude:
- env: OS=el DIST=6 PACK=rpm
compiler: clang
- env: OS=el DIST=7 PACK=rpm
compiler: clang
- - env: OS=fedora DIST=20 PACK=rpm
- compiler: clang
- - env: OS=fedora DIST=21 PACK=rpm
- compiler: clang
- env: OS=fedora DIST=22 PACK=rpm
compiler: clang
- env: OS=fedora DIST=23 PACK=rpm
compiler: clang
- - env: OS=ubuntu DIST=trusty PACK=deb
+ - env: OS=fedora DIST=rawhide PACK=rpm
compiler: clang
- env: OS=ubuntu DIST=precise PACK=deb
compiler: clang
- - env: OS=ubuntu DIST=vivid PACK=deb
+ - env: OS=ubuntu DIST=trusty PACK=deb
compiler: clang
- - env: OS=debian DIST=jessie PACK=deb
+ - env: OS=ubuntu DIST=wily PACK=deb
+ compiler: clang
+ - env: OS=ubuntu DIST=xenial PACK=deb
compiler: clang
- env: OS=debian DIST=wheezy PACK=deb
compiler: clang
+ - env: OS=debian DIST=jessie PACK=deb
+ compiler: clang
- env: OS=debian DIST=stretch PACK=deb
compiler: clang
+ - env: OS=debian DIST=sid PACK=deb
+ compiler: clang
- env: OS=el DIST=6 PACK=rpm
os: osx
- env: OS=el DIST=7 PACK=rpm
os: osx
- - env: OS=fedora DIST=20 PACK=rpm
- os: osx
- - env: OS=fedora DIST=21 PACK=rpm
- os: osx
- env: OS=fedora DIST=22 PACK=rpm
os: osx
- env: OS=fedora DIST=23 PACK=rpm
os: osx
- - env: OS=ubuntu DIST=trusty PACK=deb
+ - env: OS=fedora DIST=rawhide PACK=rpm
os: osx
- env: OS=ubuntu DIST=precise PACK=deb
os: osx
- - env: OS=ubuntu DIST=vivid PACK=deb
+ - env: OS=ubuntu DIST=trusty PACK=deb
+ os: osx
+ - env: OS=ubuntu DIST=wily PACK=deb
os: osx
- - env: OS=debian DIST=jessie PACK=deb
+ - env: OS=ubuntu DIST=xenial PACK=deb
os: osx
- env: OS=debian DIST=wheezy PACK=deb
os: osx
+ - env: OS=debian DIST=jessie PACK=deb
+ os: osx
- env: OS=debian DIST=stretch PACK=deb
os: osx
+ - env: OS=debian DIST=sid PACK=deb
+ os: osx
- os: osx
compiler: gcc
script:
- git clone https://github.com/tarantool/build.git
- - bash build/pack/travis.sh
+ - ./build/pack/travis.sh
notifications:
irc:
diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index 64fab24a51..e5a122f7f6 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -53,6 +53,9 @@ BuildRequires: python
BuildRequires: python-six
BuildRequires: python-gevent
BuildRequires: python-yaml
+%if 0%{?rhel} < 7 && 0%{?rhel} > 0
+BuildRequires: python-argparse
+%endif
Name: tarantool
# ${major}.${major}.${minor}.${patch}, e.g. 1.6.8.175
--
GitLab