[tarantool-patches] [PATCH 0/2] Travis CI: add Ubuntu Bionic

[tarantool-patches] [PATCH 0/2] Travis CI: add Ubuntu Bionic

[Alexander Turenko]

Enable Ubuntu Bionic and support recent debhelper. Related links are in
the commit messages.

This branch supersedes PR #3391.

issue: no
branch: Totktonada/add-ubuntu-bionic
travis-ci: https://travis-ci.org/tarantool/tarantool/builds/389214002

Alexander Turenko (1):
  Fix debian package build with recent debhelper

lifemaker (1):
  Travis CI: add Ubuntu Bionic

 .travis.yml  | 4 ++++
 debian/rules | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

-- 
2.17.1

[tarantool-patches] [PATCH 1/2] Travis CI: add Ubuntu Bionic

[Alexander Turenko]

From: lifemaker <kosenko.ivan@gmail.com>

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9bde17899..f825a0c7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ env:
       - OS=ubuntu DIST=artful
       - OS=ubuntu DIST=trusty
       - OS=ubuntu DIST=xenial
+      - OS=ubuntu DIST=bionic
       - OS=debian DIST=wheezy
       - OS=debian DIST=jessie
       - OS=debian DIST=stretch
@@ -43,6 +44,7 @@ matrix:
 #      - env: OS=ubuntu DIST=artful
 #      - env: OS=ubuntu DIST=trusty
 #      - env: OS=ubuntu DIST=xenial
+#      - env: OS=ubuntu DIST=bionic
 #      - env: OS=debian DIST=wheezy
 #      - env: OS=debian DIST=jessie
 #      - env: OS=debian DIST=stretch
@@ -61,6 +63,8 @@ matrix:
         os: osx
       - env: OS=ubuntu DIST=xenial
         os: osx
+      - env: OS=ubuntu DIST=bionic
+        os: osx
       - env: OS=debian DIST=wheezy
         os: osx
       - env: OS=debian DIST=jessie
-- 
2.17.1

[tarantool-patches] [PATCH 2/2] Fix debian package build with recent debhelper

[Alexander Turenko]

It is necessary for build on Ubuntu Bionic.

Debian bugreport:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881481

Debhelper commit:
https://github.com/Debian/debhelper/commit/740c628a1e571acded7e2aac5d6e7058e61da37f
---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6f8760680..f3be35edc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,8 +21,8 @@ DEB_CMAKE_EXTRA_FLAGS := \
 	-DWITH_SYSTEMD=$(WITH_SYSTEMD)
 
 DEB_DH_INSTALLINIT_ARGS    := --name=tarantool
-DEB_DH_SYSTEMD_ENABLE_ARGS := --name=tarantool tarantool.service
-DEB_DH_SYSTEMD_START_ARGS  := --no-restart-on-upgrade tarantool.service
+DEB_DH_SYSTEMD_ENABLE_ARGS_tarantool-common := --name=tarantool tarantool.service
+DEB_DH_SYSTEMD_START_ARGS_tarantool-common := --no-restart-on-upgrade tarantool.service
 
 # Needed for proper backtraces in fiber.info()
 DEB_DH_STRIP_ARGS	        := -X/usr/bin/tarantool
-- 
2.17.1