travis: clean up .travis-ci.yml wrapping and indentation
- fix line wrapping in travis.yml to make parts more legible - Travis can handle multi-line if statements if you use semicolos.
This commit is contained in:
parent
e58c6e1b73
commit
03542f2a07
21
.travis.yml
21
.travis.yml
@ -146,9 +146,9 @@ before_install:
|
|||||||
brew update;
|
brew update;
|
||||||
export HOMEBREW_NO_AUTO_UPDATE=1;
|
export HOMEBREW_NO_AUTO_UPDATE=1;
|
||||||
rm /usr/local/include/c++ ;
|
rm /usr/local/include/c++ ;
|
||||||
brew ls --versions gcc > /dev/null || brew install gcc;
|
brew ls --versions python@2 > /dev/null || brew install python@2;
|
||||||
brew ls --versions gnupg2 > /dev/null || brew install gnupg2;
|
brew ls --versions gcc > /dev/null || brew install gcc;
|
||||||
brew install python@2;
|
brew ls --versions gnupg2 > /dev/null || brew install gnupg2;
|
||||||
pip2 install --upgrade pip;
|
pip2 install --upgrade pip;
|
||||||
pip2 install virtualenv;
|
pip2 install virtualenv;
|
||||||
virtualenv venv;
|
virtualenv venv;
|
||||||
@ -163,7 +163,9 @@ install:
|
|||||||
- pip install --upgrade codecov
|
- pip install --upgrade codecov
|
||||||
- pip install --upgrade flake8
|
- pip install --upgrade flake8
|
||||||
- pip install --upgrade pep8-naming
|
- pip install --upgrade pep8-naming
|
||||||
- if [[ "$TEST_SUITE" == "doc" ]]; then pip install --upgrade -r lib/spack/docs/requirements.txt; fi
|
- if [[ "$TEST_SUITE" == "doc" ]]; then
|
||||||
|
pip install --upgrade -r lib/spack/docs/requirements.txt;
|
||||||
|
fi
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
# Need this for the git tests to succeed.
|
# Need this for the git tests to succeed.
|
||||||
@ -173,15 +175,20 @@ before_script:
|
|||||||
# Need this to be able to compute the list of changed files
|
# Need this to be able to compute the list of changed files
|
||||||
- git fetch origin develop:develop
|
- git fetch origin develop:develop
|
||||||
|
|
||||||
# Set up external dependencies for build tests, because the take too long to compile
|
# Set up external deps for build tests, b/c they take too long to compile
|
||||||
- if [[ "$TEST_SUITE" == "build" ]]; then cp share/spack/qa/configuration/packages.yaml etc/spack/packages.yaml; fi
|
- if [[ "$TEST_SUITE" == "build" ]]; then cp
|
||||||
|
share/spack/qa/configuration/packages.yaml etc/spack/packages.yaml;
|
||||||
|
fi
|
||||||
|
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
# Building
|
# Building
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
script:
|
script:
|
||||||
- share/spack/qa/run-$TEST_SUITE-tests
|
- share/spack/qa/run-$TEST_SUITE-tests
|
||||||
- if [[ "$TEST_SUITE" == "unit" || "$TEST_SUITE" == "build" ]]; then codecov --env PYTHON_VERSION --required --flags "${TEST_SUITE}${TRAVIS_OS_NAME}"; fi
|
- if [[ "$TEST_SUITE" == "unit" || "$TEST_SUITE" == "build" ]]; then
|
||||||
|
codecov --env PYTHON_VERSION
|
||||||
|
--required --flags "${TEST_SUITE}${TRAVIS_OS_NAME}";
|
||||||
|
fi
|
||||||
|
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
# Notifications
|
# Notifications
|
||||||
|
Loading…
Reference in New Issue
Block a user