From fa546dc3e8b8c729f59f98eb525dd032985e1725 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 1 Sep 2019 14:41:31 +0200 Subject: [PATCH] travis: don't run old Xenial LTS on pull requests The branch (for pull requests), is the base/target branch, so for pull requests against master, these would still be run. From the travis documentation: > branch (the current branch name; for pull requests: the base branch name) This patch excludes these jobs by not running them for pull request (event type=pull_request or event type=push (when rebasing a pull request)). Signed-off-by: Sebastiaan van Stijn --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1adb825dc..b3ede41e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,15 +21,15 @@ env: matrix: include: # On master, also test against the previous LTS (Xenial / Ubuntu 16.04 LTS) - - if: branch = master + - if: branch = master AND type NOT IN (push, 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 + - if: branch = master AND type NOT IN (push, 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 + - if: branch = master AND type NOT IN (push, pull_request) os: linux dist: xenial env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runtime.v1.linux TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=xenial