diff options
| author |   Antoine Pitrou <pitrou@free.fr> | 2018-02-27 21:40:37 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-02-27 21:40:37 +0100 |
| commit | d7687eb4b66c9f675b112eff1169326a1766c111 (patch) | |
| tree | bb762cb406dc076a2d34d8c31e16603971858750 /.travis.yml | |
| parent | bpo-10381, bpo-32403: What's new entries for changes to datetime (gh-5814) (diff) | |
| download | cpython-d7687eb4b66c9f675b112eff1169326a1766c111.tar.gz cpython-d7687eb4b66c9f675b112eff1169326a1766c111.tar.bz2 cpython-d7687eb4b66c9f675b112eff1169326a1766c111.zip | |
bpo-31355: Travis-CI: re-enable macOS job (#5858)
The long build queues that plagued macOS builds on Travis seem to be
a thing of the past now.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index ab43318975f..292b9c68763 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,15 @@ matrix: - python -m pip install sphinx~=1.6.1 blurb script: - make check suspicious html SPHINXOPTS="-q -W -j4" + - os: osx + language: c + compiler: clang + # Testing under macOS is optional until testing stability has been demonstrated. + env: OPTIONAL=true + before_install: + # Python 3 is needed for Argument Clinic and multissl + - brew install xz python3 + - export PATH=$(brew --prefix)/bin:$(brew --prefix)/sbin:$PATH - os: linux language: c compiler: gcc @@ -76,9 +85,9 @@ before_install: - set -e - | # Check short-circuit conditions - if [ "${TESTING}" != "docs" ] + if [[ "${TESTING}" != "docs" ]] then - if [ "$TRAVIS_PULL_REQUEST" = "false" ] + if [[ "$TRAVIS_PULL_REQUEST" == "false" ]] then echo "Not a PR, doing full build." else @@ -101,7 +110,7 @@ before_install: install: - | # Install OpenSSL as necessary - if [ "${TESTING}" != "docs" ] + if [[ "${TESTING}" != "docs" ]] then # clang complains about unused-parameter a lot, redirect stderr python3 Tools/ssl/multissltests.py --steps=library \ |