Merge pull request #3614 from thaJeztah/travis_bionic_take2

dmcgowan · web-flow · commit c7c7955757e0 · 2019-09-03T17:42:40.000-07:00
travis: fix Xenial tests not being run on master
diff --git 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
