From 2398421d50978b653398f3ead57ec243fb0ff665 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Mon, 5 Aug 2019 15:35:51 -0700 Subject: [PATCH] Fix travis matrix Move matrix components next to each other for clarity. Explicitly add special matrix combinations. Signed-off-by: Derek McGowan --- .travis.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b36680b5..39a549ca9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,16 @@ os: go: - "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: include: - - os: "linux" + - os: linux 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 @@ -36,16 +42,6 @@ addons: - socat - 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: - uname -r