From 777bdeb1835c41990e8f319bef93fceb85c8f4ac Mon Sep 17 00:00:00 2001
From: Alexander Turenko <alexander.turenko@tarantool.org>
Date: Tue, 8 Sep 2020 22:34:05 +0300
Subject: [PATCH 1/2] travis-ci: update target distros

Added Fedora 31 and Ubuntu Focal.

Dropped EOL distros: Ubuntu Cosmic and Ubuntu Disco: I guess CI will
fail on them at repositories metadata updating.

Those targets are for deploy RPM / Deb packages to our repositories.
---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62939b9..d7908c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,18 +33,18 @@ jobs:
       env: OS=fedora DIST=29
     - name: "Fedora 30 build + deploy RPM"
       env: OS=fedora DIST=30
+    - name: "Fedora 31 build + deploy RPM"
+      env: OS=fedora DIST=31
     - name: "Ubuntu Trusty (14.04) build + deploy DEB"
       env: OS=ubuntu DIST=trusty
     - name: "Ubuntu Xenial (16.04) build + deploy DEB"
       env: OS=ubuntu DIST=xenial
     - name: "Ubuntu Bionic (18.04) build + deploy DEB"
       env: OS=ubuntu DIST=bionic
-    - name: "Ubuntu Cosmic (18.10) build + deploy DEB"
-      env: OS=ubuntu DIST=cosmic
-    - name: "Ubuntu Disco (19.04) build + deploy DEB"
-      env: OS=ubuntu DIST=disco
     - name: "Ubuntu Eoan (19.10) build + deploy DEB"
       env: OS=ubuntu DIST=eoan
+    - name: "Ubuntu Focal (20.04) build + deploy DEB"
+      env: OS=ubuntu DIST=focal
     - name: "Debian Jessie (8) build + deploy DEB"
       env: OS=debian DIST=jessie
     - name: "Debian Stretch (9) build + deploy DEB"

From 7b3295f8deba04e906a0fc5f4e76fe4eab8d0ffc Mon Sep 17 00:00:00 2001
From: Alexander Turenko <alexander.turenko@tarantool.org>
Date: Tue, 8 Sep 2020 22:37:42 +0300
Subject: [PATCH 2/2] travis-ci: deploy to tarantool-2.4 repository

Fixes #40
---
 .travis.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d7908c7..89ce599 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -107,6 +107,16 @@ deploy:
     on:
       branch: master
       condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
+  - provider: packagecloud
+    username: tarantool
+    repository: "2_4"
+    token: ${PACKAGECLOUD_TOKEN}
+    dist: ${OS}/${DIST}
+    package_glob: build/*.{rpm,deb,dsc}
+    skip_cleanup: true
+    on:
+      branch: master
+      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
 
   # Deploy packages to PackageCloud from tags
   # see:
@@ -152,6 +162,16 @@ deploy:
     on:
       tags: true
       condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
+  - provider: packagecloud
+    username: tarantool
+    repository: "2_4"
+    token: ${PACKAGECLOUD_TOKEN}
+    dist: ${OS}/${DIST}
+    package_glob: build/*.{rpm,deb,dsc}
+    skip_cleanup: true
+    on:
+      tags: true
+      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
 
 notifications:
   email: