diff options
| author | Mats Wichmann <mats@linux.com> | 2019-04-01 13:51:43 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2019-04-01 23:37:02 (GMT) |
| commit | c7fedae70b112c03f8898e4b3091770a07b46f2c (patch) | |
| tree | 554bfd6dbacb2a0939a007e9deb93dd6985c46b5 /.travis.yml | |
| parent | 4b2c0674a783c6d2d1f66d2588223bd5d99acda7 (diff) | |
| download | SCons-c7fedae70b112c03f8898e4b3091770a07b46f2c.zip SCons-c7fedae70b112c03f8898e4b3091770a07b46f2c.tar.gz SCons-c7fedae70b112c03f8898e4b3091770a07b46f2c.tar.bz2 | |
Run all CI builds with -j 2
With the output ordering cleaned up in runtest.py, run all the
jobs as two-process to try to lot some more off the build itme.
This is a CI-config only change, no code.
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index a8cb940..b0d64e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,13 +27,38 @@ stages: - Coverage - Test +# Note: Travis does not provide a way to specify the order of +# jobs within a Stage, which are "run in parallel", but with +# limitations: from observation four or five are kicked +# off, then additional jobs as initial ones complete. +# We want the slowest jobs in the first batch since the +# faster ones are less than half the time of the slowest, +# we should be able to finish the Test task in the time of the +# slowest job rather than (a fast job + the slowest job). +# Putting the pypy jobs first may help with this, though it's +# apparently not guaranteed. + jobs: include: - &test_job stage: Test - script: python runtest.py -a -t || if [[ $? == 2 ]]; then true; else false; fi + script: python runtest.py -a -t -j 2 || if [[ $? == 2 ]]; then true; else false; fi before_script: skip after_success: skip + python: pypy3 + env: + - PYVER=pypy3 + - PYTHON=pypy3 + sudo: required + + - <<: *test_job + python: pypy + env: + - PYVER=pypy + - PYTHON=pypy + sudo: required + + - <<: *test_job python: 2.7 env: - PYVER=27 @@ -62,24 +87,6 @@ jobs: sudo: required dist: xenial # required for Python 3.7 (travis-ci/travis-ci#9069) - - &slow_test_job - stage: Test - script: python runtest.py -a -j 4 -t || if [[ $? == 2 ]]; then true; else false; fi - before_script: skip - after_success: skip - python: pypy - env: - - PYVER=pypy - - PYTHON=pypy - sudo: required - - - <<: *slow_test_job - python: pypy3 - env: - - PYVER=pypy3 - - PYTHON=pypy3 - sudo: required - - &coverage_jobs stage: Coverage @@ -128,7 +135,7 @@ jobs: - if (( ${BUILD_JOB_NUM} == ${TOTAL_BUILD_JOBS} )); then end=$(wc -l < all_tests); fi - if (( ${start} == 0 )); then start=1; fi - sed -n ${start},${end}p all_tests > build_tests - - coverage run -p --rcfile=$PWD/.coveragerc runtest.py -f build_tests || if [[ $? == 2 ]]; then true; else false; fi + - coverage run -p --rcfile=$PWD/.coveragerc runtest.py -f build_tests -j 2 || if [[ $? == 2 ]]; then true; else false; fi after_script: - coverage combine |