Merge pull request #3614 from thaJeztah/travis_bionic_take2
travis: fix Xenial tests not being run on master
This commit is contained in:
commit
c7c7955757
@ -20,16 +20,16 @@ env:
|
|||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
# On master, also test against the previous LTS (Xenial / Ubuntu 16.04 LTS)
|
# Skip testing previous LTS (Xenial / Ubuntu 16.04 LTS) on pull requests
|
||||||
- if: branch = master AND type NOT IN (push, pull_request)
|
- if: type != pull_request
|
||||||
os: linux
|
os: linux
|
||||||
dist: xenial
|
dist: xenial
|
||||||
env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=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
|
os: linux
|
||||||
dist: xenial
|
dist: xenial
|
||||||
env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=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
|
os: linux
|
||||||
dist: xenial
|
dist: xenial
|
||||||
env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runtime.v1.linux TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=xenial
|
env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runtime.v1.linux TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=xenial
|
||||||
|
Loading…
Reference in New Issue
Block a user