diff options
| author | Brett Cannon <brettcannon@users.noreply.github.com> | 2017-03-17 22:41:48 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 22:41:48 (GMT) |
| commit | 825153bf8fd3b8ee80cf580d24b1a1b64bd8f4d1 (patch) | |
| tree | 3dec71b8bc11cffa59b7eb58798b3ce5e61c4f18 | |
| parent | e59af55c28b657cdf57c71a7b0837c9e9f4b2a31 (diff) | |
| download | cpython-825153bf8fd3b8ee80cf580d24b1a1b64bd8f4d1.zip cpython-825153bf8fd3b8ee80cf580d24b1a1b64bd8f4d1.tar.gz cpython-825153bf8fd3b8ee80cf580d24b1a1b64bd8f4d1.tar.bz2 | |
Combine the C++ header CI build into the main C build (GH-697) (GH-705)
This will eliminate one of the builds in Travis, allowing for CI overall to complete faster.
(cherry picked from commit 993d4b3440f2282976901ce66879037c4443868a)
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 27b63c6..36961e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,15 +64,6 @@ matrix: # Make the `coverage` command available to Codecov w/ a version of Python that can parse all source files. - source ./venv/bin/activate - bash <(curl -s https://codecov.io/bash) - - os: linux - language: cpp - compiler: clang - env: - - TESTING="C++ header compatibility" - before_script: - - ./configure - script: - - echo '#include "Python.h"' > test.cc && $CXX -c test.cc -o /dev/null -I ./Include -I . # Travis provides only 2 cores, so don't overdue the parallelism and waste memory. before_script: @@ -88,6 +79,8 @@ before_script: script: # `-r -w` implicitly provided through `make buildbottest`. - make buildbottest TESTOPTS="-j4" + # Test for C++ header compatibility. + - echo '#include "Python.h"' > test.cc && $CXX -c test.cc -o /dev/null -I ./Include -I . notifications: email: false |