Merge pull request #3493 from dmcgowan/fix-travis-matrix

estesp · web-flow · commit dce8541387a5 · 2019-08-06T10:04:50.000-04:00
Fix travis matrix
diff --git 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
 
