summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brettcannon@users.noreply.github.com>2017-03-17 22:29:27 (GMT)
committerGitHub <noreply@github.com>2017-03-17 22:29:27 (GMT)
commit993d4b3440f2282976901ce66879037c4443868a (patch)
tree7bbd3c336900d07f4a95b009bf0f4e733b48e09d
parentcb5297a9e6b51c736ab8564b1a123577ba0dd2ad (diff)
downloadcpython-993d4b3440f2282976901ce66879037c4443868a.zip
cpython-993d4b3440f2282976901ce66879037c4443868a.tar.gz
cpython-993d4b3440f2282976901ce66879037c4443868a.tar.bz2
Combine the C++ header CI build into the main C build (GH-697)
This will eliminate one of the builds in Travis, allowing for CI overall to complete faster.
-rw-r--r--.travis.yml11
1 files changed, 2 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 6c0b73d..1e105dc 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