]> granicus.if.org Git - python/commitdiff
Backport recent .travis.yml changes (#308)
authorBerker Peksag <berker.peksag@gmail.com>
Sun, 26 Feb 2017 13:07:12 +0000 (16:07 +0300)
committerGitHub <noreply@github.com>
Sun, 26 Feb 2017 13:07:12 +0000 (16:07 +0300)
Backported changes from master:

b52260d8bf392aa04c48b8c2467a4c034184de86
984eef7d6d78e1213d6ea99897343a5059a07c59
532519770dea5d353f0b0d718c8881a15c7542df
91b0e7d0ca7c59df28f6a6fc1e8eb86a3925b76c

.travis.yml

index dc3a00d1f4b5a337196264bb35b76da098708c0e..27b63c6c08b37645d38c029a961bac2a0bd7ab68 100644 (file)
@@ -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