Skip to content

Commit ddf8f14

Browse files
authored
[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 c53b13b)
1 parent e14af32 commit ddf8f14

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ matrix:
4040
script:
4141
- make check suspicious html SPHINXOPTS="-q -W -j4"
4242

43-
# Travis provides only 2 cores, so don't overdue the parallelism and waste memory.
43+
# Travis provides only 2 cores, so don't overdo the parallelism and waste memory.
4444
before_script:
4545
- |
46-
if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.(rst|yml)$)|(^Doc)/'
46+
if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.rst$)|(^Doc)'
4747
then
4848
echo "Only docs were updated, stopping build process."
4949
exit
@@ -53,7 +53,7 @@ before_script:
5353
5454
script:
5555
# `-r -w` implicitly provided through `make buildbottest`.
56-
- make buildbottest TESTOPTS="-j4"
56+
- make buildbottest TESTOPTS="-j4 -uall,-cpu"
5757

5858
notifications:
5959
email: false

0 commit comments

Comments
 (0)