From cd79e0edfe815875f33609e839caff2a4b914b55 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 4 Sep 2019 01:29:03 +0200 Subject: [PATCH] travis: fix Xenial tests not being run on master Signed-off-by: Sebastiaan van Stijn --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3ede41e4..2e0e1452a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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