From 5ecdabd09b4f759e0641358e474db7f2c6358b50 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Wed, 31 May 2017 18:34:00 -0400 Subject: [PATCH 1/2] Fix merge conflict --- .travis.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index df66713eb15b31..209c8a63fa4b7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,21 +6,20 @@ group: beta # To cache doc-building dependencies. cache: pip -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 +branches: + only: + - master + - /^\d\.\d$/ matrix: 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: 2.7 From d5e753b79ef8ce271745b8ba0e91966144a817f2 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Wed, 31 May 2017 15:43:08 -0700 Subject: [PATCH 2/2] [2.7] Fix Travis config to reinstate test build (GH-1879). (cherry picked from commit a5aa72ac789052411797c6f079ffff0a9fdbf82c)