From: Brett Cannon <brettcannon@users.noreply.github.com>
Date: Wed, 31 May 2017 22:52:58 +0000 (-0700)
Subject: [3.5] Fix Travis config to reinstate test build (GH-1879) (GH-1890)
X-Git-Tag: v3.5.4rc1~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec675d5245812128043d17c0f63ebfc57fe5e1e5;p=python

[3.5] Fix Travis config to reinstate test build (GH-1879) (GH-1890)

(cherry picked from commit a5aa72ac789052411797c6f079ffff0a9fdbf82c)
---

diff --git a/.travis.yml b/.travis.yml
index cf524e5549..e4e7b3d9b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,25 +11,19 @@ branches:
     - master
     - /^\d\.\d$/
 
-os:
-  - linux
-  # macOS builds are disabled as the machines are under-provisioned on Travis,
-  # adding up to an extra hour completing a full CI run.
-
-compiler:
-  - clang
-  # gcc also works, but to keep the # of concurrent builds down, we use one C
-  # compiler here and the other to run the coverage build.
-
-env:
-  - TESTING=cpython
-
 matrix:
   fast_finish: true
   allow_failures:
     - env:
        - TESTING=coverage
   include:
+    - os: linux
+      language: c
+      compiler: clang
+      # gcc also works, but to keep the # of concurrent builds down, we use one C
+      # compiler here and the other to run the coverage build.
+      env:
+        - TESTING=cpython
     - os: linux
       language: python
       python: 3.6