From 214b8328d21a855af67762ff3d35ff2abfd3b3ea Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 30 Aug 2019 09:42:14 +0200
Subject: [PATCH] travis: add Bionic (Ubuntu 18.04 LTS) to test matrix

Using bionic (current LTS) as default, and add xenial (Ubuntu 16.04 LTS)
to the matrix, to test the previous LTS release as well on master

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .travis.yml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c97348a48..fbbb6db79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 sudo: required
 # setup travis so that we can run containers for integration tests
 services:
@@ -18,6 +18,22 @@ env:
   - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runtime.v1.linux TRAVIS_CGO_ENABLED=1
   - TRAVIS_GOOS=darwin TRAVIS_CGO_ENABLED=0
 
+matrix:
+  include:
+    # On master, also test against the previous LTS (Xenial / Ubuntu 16.04 LTS)
+    - if: branch = master
+      os: linux
+      dist: xenial
+      env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1
+    - if: branch = master
+      os: linux
+      dist: xenial
+      env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1
+    - if: branch = master
+      os: linux
+      dist: xenial
+      env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runtime.v1.linux TRAVIS_CGO_ENABLED=1
+
 go_import_path: github.com/containerd/containerd
 
 addons:
@@ -31,7 +47,7 @@ addons:
       - python-minimal
       - libcap-dev
       - libaio-dev
-      - libprotobuf-c0-dev
+      - libprotobuf-c-dev
       - libprotobuf-dev
       - socat