summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml26
1 files changed, 18 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 61b829a9c5..3b55797beb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,12 +14,17 @@ branches:
jobs:
fast_finish: true
include:
- - stage: 'flake8'
+ - stage: 'flake8 + documentation'
python: '2.7'
os: linux
language: python
env: TEST_SUITE=flake8
- - stage: 'unit tests + documentation'
+ - stage: 'flake8 + documentation'
+ python: '2.7'
+ os: linux
+ language: python
+ env: TEST_SUITE=doc
+ - stage: 'unit tests'
python: '2.6'
os: linux
language: python
@@ -44,13 +49,10 @@ jobs:
os: linux
language: python
env: [ TEST_SUITE=unit, COVERAGE=true ]
- - os: osx
+ - stage: 'unit tests - osx'
+ os: osx
language: generic
env: [ TEST_SUITE=unit, PYTHON_VERSION=2.7, COVERAGE=true ]
- - python: '2.7'
- os: linux
- language: python
- env: TEST_SUITE=doc
# mpich (AutotoolsPackage)
- stage: 'build tests'
python: '2.7'
@@ -93,6 +95,14 @@ jobs:
language: python
env: [ TEST_SUITE=build, COVERAGE=true, 'SPEC=mpich' ]
+stages:
+ - 'flake8 + documentation'
+ - 'unit tests'
+ - 'build tests'
+ - name: 'unit tests - osx'
+ if: type IN (cron)
+
+
#=============================================================================
# Environment
#=============================================================================
@@ -151,7 +161,7 @@ before_script:
#=============================================================================
script:
- share/spack/qa/run-$TEST_SUITE-tests
- - if [[ "$COVERAGE" == "true" ]]; then codecov --env PY_VERSION --required ; fi
+ - if [[ "$COVERAGE" == "true" ]]; then codecov --env PYTHON_VERSION --required --flags "${TEST_SUITE}${TRAVIS_OS_NAME}"; fi
#=============================================================================
# Notifications