Fix travis matrix

Move matrix components next to each other for clarity.
Explicitly add special matrix combinations.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan 2019-08-05 15:35:51 -07:00
parent 29e56c5625
commit 2398421d50
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB

View File

@ -13,10 +13,16 @@ os:
go: go:
- "1.12.x" - "1.12.x"
env:
- TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1
- TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1
matrix: matrix:
include: include:
- os: "linux" - os: linux
env: TRAVIS_GOOS=darwin TRAVIS_CGO_ENABLED=0 env: TRAVIS_GOOS=darwin TRAVIS_CGO_ENABLED=0
- os: linux
env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runtime.v1.linux TRAVIS_CGO_ENABLED=1
go_import_path: github.com/containerd/containerd go_import_path: github.com/containerd/containerd
@ -36,16 +42,6 @@ addons:
- socat - socat
- libseccomp-dev - libseccomp-dev
env:
- TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1
- TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1
- TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runtime.v1.linux TRAVIS_CGO_ENABLED=1
matrix:
exclude:
- env: TRAVIS_GOOS=darwin TRAVIS_CGO_ENABLED=0
os: linux-ppc64le
before_install: before_install:
- uname -r - uname -r