From: Berker Peksag <berker.peksag@gmail.com>
Date: Sun, 26 Feb 2017 13:07:12 +0000 (+0300)
Subject: Backport recent .travis.yml changes (#308)
X-Git-Tag: v3.6.1rc1~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c7b8f423ab1de6221351036ac4e139861a2f4a6;p=python

Backport recent .travis.yml changes (#308)

Backported changes from master:

* b52260d8bf392aa04c48b8c2467a4c034184de86
* 984eef7d6d78e1213d6ea99897343a5059a07c59
* 532519770dea5d353f0b0d718c8881a15c7542df
* 91b0e7d0ca7c59df28f6a6fc1e8eb86a3925b76c
---

diff --git a/.travis.yml b/.travis.yml
index dc3a00d1f4..27b63c6c08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,11 @@ group: beta
 # To cache doc-building dependencies.
 cache: pip
 
+branches:
+  only:
+    - master
+    - /^\d\.\d$/
+
 os:
   - linux
   # macOS builds are disabled as the machines are under-provisioned on Travis,
@@ -20,6 +25,7 @@ env:
   - TESTING=cpython
 
 matrix:
+  fast_finish: true
   allow_failures:
     - env:
        - TESTING=coverage
@@ -30,17 +36,10 @@ matrix:
       env:
         - TESTING=docs
       before_script:
-        - |
-            if git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '^Doc/'
-            then
-              echo "Docs weren't updated, stopping build process."
-              exit
-            fi
-            cd Doc
-            make venv PYTHON=python3
+        - cd Doc
+        - make venv
       script:
-        - make html SPHINXBUILD="./venv/bin/python3 -m sphinx" SPHINXOPTS="-q"
-        - make check
+        - make check suspicious html PYTHON="./venv/bin/python" SPHINXBUILD="./venv/bin/python -m sphinx" SPHINXOPTS="-q"
     - os: linux
       language: c
       compiler: clang