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