diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-09-04 10:12:52 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-09-04 10:12:52 +0200 |
| commit | 47f6a6d3cfd1285fb5d8cd95a415c8a24045b330 (patch) | |
| tree | 8f0b73ead979cd5e9f8181642d0ee1cf1ddff79b /.travis.yml | |
| parent | f5433477b9f7c98ca00947cf1b1fdc106cca1080 (diff) | |
| parent | 16c5403ab3ca35dfa6d715ce2c5434c65de81c17 (diff) | |
| download | spack-47f6a6d3cfd1285fb5d8cd95a415c8a24045b330.tar.gz spack-47f6a6d3cfd1285fb5d8cd95a415c8a24045b330.tar.bz2 spack-47f6a6d3cfd1285fb5d8cd95a415c8a24045b330.tar.xz spack-47f6a6d3cfd1285fb5d8cd95a415c8a24045b330.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase
Conflicts:
lib/spack/spack/build_environment.py
lib/spack/spack/package.py
var/spack/repos/builtin/packages/astyle/package.py
var/spack/repos/builtin/packages/lzo/package.py
var/spack/repos/builtin/packages/openjpeg/package.py
var/spack/repos/builtin/packages/swiftsim/package.py
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index b376a33490..7961133c1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,27 +1,38 @@ language: python +# Construct build matrix python: - - "2.6" - - "2.7" + - 2.6 + - 2.7 + env: - - TEST_TYPE=unit - - TEST_TYPE=flake8 + - TEST_SUITE=unit + - TEST_SUITE=flake8 + - TEST_SUITE=doc -# Exclude flake8 from python 2.6 matrix: exclude: - - python: "2.6" - env: TEST_TYPE=flake8 + - python: 2.6 + # Flake8 no longer supports Python 2.6 + env: TEST_SUITE=flake8 # Use new Travis infrastructure (Docker can't sudo yet) sudo: false -# Install coveralls to obtain code coverage +# Docs need graphviz to build +addons: + apt: + packages: + - graphviz + +# Install various dependencies install: - - "pip install coveralls" - - "pip install flake8" + - pip install coveralls + - pip install flake8 + - pip install sphinx + - pip install mercurial -before_install: +before_script: # Need this for the git tests to succeed. - git config --global user.email "spack@example.com" - git config --global user.name "Test User" @@ -29,18 +40,13 @@ before_install: # Need this to be able to compute the list of changed files - git fetch origin develop:develop -script: - # Run unit tests with code coverage plus install libdwarf - - 'if [ "$TEST_TYPE" = "unit" ]; then share/spack/qa/run-unit-tests; fi' - # Run flake8 code style checks. - - 'if [ "$TEST_TYPE" = "flake8" ]; then share/spack/qa/run-flake8; fi' +script: share/spack/qa/run-$TEST_SUITE-tests after_success: - - 'if [ "$TEST_TYPE" = "unit" ] && [ "$TRAVIS_PYTHON_VERSION" = "2.7" ]; then coveralls; fi' + - if [[ $TEST_SUITE == unit && $TRAVIS_PYTHON_VERSION == 2.7 ]]; then coveralls; fi notifications: email: - recipients: - - tgamblin@llnl.gov + recipients: tgamblin@llnl.gov on_success: change on_failure: always |