From ddf8f141f0181f9cac05c87383ea60887acffaec Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Mon, 5 Jun 2017 20:03:05 -0500 Subject: [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) --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bb4ce6..9673254 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 -- cgit v0.12