Commit c53b13b2 authored by Zachary Ware's avatar Zachary Ware Committed by GitHub

bpo-30417: Disable 'cpu' and 'tzdata' resources on Travis (GH-1928)

Also weakens the 'should this be run?' regex to allow all builds when .travis.yml changes.
parent e6a23c8f
...@@ -46,7 +46,7 @@ matrix: ...@@ -46,7 +46,7 @@ matrix:
env: OPTIONAL=true env: OPTIONAL=true
before_script: before_script:
- | - |
if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.(rst|yml)$)|(^Doc)|(^Misc)/' if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.rst$)|(^Doc)|(^Misc)'
then then
echo "Only docs were updated, stopping build process." echo "Only docs were updated, stopping build process."
exit exit
...@@ -58,16 +58,16 @@ matrix: ...@@ -58,16 +58,16 @@ matrix:
./venv/bin/python -m pip install -U coverage ./venv/bin/python -m pip install -U coverage
script: script:
# Skip tests that re-run the entire test suite. # Skip tests that re-run the entire test suite.
- ./venv/bin/python -m coverage run --pylib -m test -uall -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn - ./venv/bin/python -m coverage run --pylib -m test -uall,-cpu,-tzdata -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn
after_script: # Probably should be after_success once test suite updated to run under coverage.py. after_script: # Probably should be after_success once test suite updated to run under coverage.py.
# Make the `coverage` command available to Codecov w/ a version of Python that can parse all source files. # Make the `coverage` command available to Codecov w/ a version of Python that can parse all source files.
- source ./venv/bin/activate - source ./venv/bin/activate
- bash <(curl -s https://codecov.io/bash) - bash <(curl -s https://codecov.io/bash)
# 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: before_script:
- | - |
if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.(rst|yml)$)|(^Doc)|(^Misc)/' if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.rst$)|(^Doc)|(^Misc)'
then then
echo "Only docs were updated, stopping build process." echo "Only docs were updated, stopping build process."
exit exit
...@@ -77,7 +77,7 @@ before_script: ...@@ -77,7 +77,7 @@ before_script:
script: script:
# `-r -w` implicitly provided through `make buildbottest`. # `-r -w` implicitly provided through `make buildbottest`.
- make buildbottest TESTOPTS="-j4" - make buildbottest TESTOPTS="-j4 -uall,-cpu,-tzdata"
notifications: notifications:
email: false email: false
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment