summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorBrett Cannon <brettcannon@users.noreply.github.com>2017-06-03 17:33:53 (GMT)
committerGitHub <noreply@github.com>2017-06-03 17:33:53 (GMT)
commitba6bfcdfb43f06f025613348bb6c71ff9b597b35 (patch)
tree32eef7b7631aea4f83686ee3d3112480d1a1c00d /.travis.yml
parentc63ae1122f84d4188ffadfd1454902093eb10be1 (diff)
downloadcpython-ba6bfcdfb43f06f025613348bb6c71ff9b597b35.zip
cpython-ba6bfcdfb43f06f025613348bb6c71ff9b597b35.tar.gz
cpython-ba6bfcdfb43f06f025613348bb6c71ff9b597b35.tar.bz2
[3.6] Turn on macOS builds for Travis (GH-1846) (#1929)
Initially the macOS builds are allowed to fail until such time that they can be determined to be stable and not add an unacceptable amount of time to the overall Travis-passing process. (cherry picked from commit 21c2dd7cf8414c903f0e83cf1d6b7f02f645f422)
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml20
1 files changed, 11 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index e4e7b3d..4dfefb7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,21 +14,24 @@ branches:
matrix:
fast_finish: true
allow_failures:
- - env:
- - TESTING=coverage
+ - env: OPTIONAL=true
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
+ # compiler here and the other to run the coverage build. Clang is preferred
+ # in this instance for its better error messages.
+ env: TESTING=cpython
+ - os: osx
+ language: c
+ compiler: clang
+ # Testing under macOS is optional until testing stability has been demonstrated.
+ env: OPTIONAL=true
- os: linux
language: python
python: 3.6
- env:
- - TESTING=docs
+ env: TESTING=docs
before_script:
- cd Doc
# Sphinx is pinned so that new versions that introduce new warnings won't suddenly cause build failures.
@@ -39,8 +42,7 @@ matrix:
- os: linux
language: c
compiler: gcc
- env:
- - TESTING=coverage
+ env: OPTIONAL=true
before_script:
- |
if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.(rst|yml)$)|(^Doc)/'