diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2017-06-05 20:03:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 20:03:05 -0500 |
| commit | ddf8f141f0181f9cac05c87383ea60887acffaec (patch) | |
| tree | 94c3eeab966ec56d7b9375ab9038928c194cc0d8 /.travis.yml | |
| parent | e14af32cc656249c2d785d190cc981869aa257f6 (diff) | |
| download | cpython-git-ddf8f141f0181f9cac05c87383ea60887acffaec.tar.gz | |
[2.7] bpo-30417: Disable 'cpu' resource on Travis (GH-1928)
Also weakens the 'should this be run?' regex to allow all builds when .travis.yml changes.
(cherry picked from commit c53b13b270767948fddb58b287149c499f9a03c4)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 5bb4ce6f36..9673254828 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,10 +40,10 @@ matrix: script: - make check suspicious html SPHINXOPTS="-q -W -j4" -# Travis provides only 2 cores, so don't overdue the parallelism and waste memory. +# Travis provides only 2 cores, so don't overdo the parallelism and waste memory. before_script: - | - if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.(rst|yml)$)|(^Doc)/' + if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.rst$)|(^Doc)' then echo "Only docs were updated, stopping build process." exit @@ -53,7 +53,7 @@ before_script: script: # `-r -w` implicitly provided through `make buildbottest`. - - make buildbottest TESTOPTS="-j4" + - make buildbottest TESTOPTS="-j4 -uall,-cpu" notifications: email: false |