travis: fix Xenial tests not being run on master

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-09-04 01:29:03 +02:00
parent 48fb479e22
commit cd79e0edfe
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C

View File

@ -20,16 +20,16 @@ env:
matrix:
include:
# On master, also test against the previous LTS (Xenial / Ubuntu 16.04 LTS)
- if: branch = master AND type NOT IN (push, pull_request)
# Skip testing previous LTS (Xenial / Ubuntu 16.04 LTS) on pull requests
- if: type != pull_request
os: linux
dist: xenial
env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=xenial
- if: branch = master AND type NOT IN (push, pull_request)
- if: type != pull_request
os: linux
dist: xenial
env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=xenial
- if: branch = master AND type NOT IN (push, pull_request)
- if: type != pull_request
os: linux
dist: xenial
env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runtime.v1.linux TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=xenial