Moving some things around in script
This commit is contained in:
parent
9e4916e621
commit
163c36c82b
1 changed files with 10 additions and 8 deletions
18
.travis.yml
18
.travis.yml
|
@ -48,6 +48,9 @@ install:
|
|||
else
|
||||
export PYTHONPATH=$(pwd)/mason_packages/.link/lib/python/site-packages;
|
||||
fi;
|
||||
- if [[ ${COVERAGE} == true ]]; then
|
||||
PYTHONUSERBASE=$(pwd)/mason_packages/.link pip install --user cpp-coveralls;
|
||||
fi;
|
||||
|
||||
script:
|
||||
- source bootstrap.sh
|
||||
|
@ -64,17 +67,16 @@ script:
|
|||
- git clone --depth=1 https://github.com/mapnik/test-data test-data
|
||||
- git clone --depth=1 https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
|
||||
- make test
|
||||
- if [[ ${COVERAGE} != true ]]; then
|
||||
./mason_latest.sh mapnik build;
|
||||
./mason_latest.sh mapnik link;
|
||||
./mason_latest.sh mapnik publish;
|
||||
fi;
|
||||
- if [[ ${COVERAGE} == true ]]; then
|
||||
PYTHONUSERBASE=$(pwd)/mason_packages/.link pip install --user cpp-coveralls;
|
||||
fi;
|
||||
- if [[ ${COVERAGE} == true ]]; then
|
||||
./mason_packages/.link/bin/cpp-coveralls --build-root . --gcov-options '\-lp' --exclude mason_packages --exclude .sconf_temp --exclude benchmark --exclude deps --exclude scons --exclude test --exclude demo --exclude docs --exclude fonts --exclude utils > /dev/null;
|
||||
fi;
|
||||
- if [[ ${COVERAGE} != true ]]; then
|
||||
make bench;
|
||||
fi;
|
||||
|
||||
after_success:
|
||||
- if [[ ${COVERAGE} != true ]]; then
|
||||
./mason_latest.sh build;
|
||||
./mason_latest.sh link;
|
||||
./mason_latest.sh publish;
|
||||
fi;
|
||||
|
|
Loading…
Add table
Reference in a new issue