sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

travis: some tweaks

Browse source 
- remove unused MASON_PUBLISH variables
- defer downloading test-data until after successful compilation;
  they are big and don't update frequently, so I added depth limit;
  if that doesn't work well, feel free to increase or remove it
This commit is contained in:
Mickey Rose 2018-08-01 17:59:09 +02:00
parent 7f0daee8b3
commit f400f17c75
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.travis.yml
View file

@ -62,11 +62,8 @@ before_install:
- source scripts/travis-common.sh - source scripts/travis-common.sh
- export PATH=${PREFIX}/bin:$(pwd)/mason_packages/.link/bin:${PATH} - export PATH=${PREFIX}/bin:$(pwd)/mason_packages/.link/bin:${PATH}
- export COVERAGE=${COVERAGE:-false} - export COVERAGE=${COVERAGE:-false}
- export MASON_PUBLISH=${MASON_PUBLISH:-false}
- export BENCH=${BENCH:-false} - export BENCH=${BENCH:-false}
- if [[ ${TRAVIS_BRANCH} != 'master' ]]; then export MASON_PUBLISH=false; fi - git_submodule_update --init deps/
- if [[ ${TRAVIS_PULL_REQUEST} != 'false' ]]; then export MASON_PUBLISH=false; fi
- git_submodule_update --init
install: install:
- on 'osx' export DATA_PATH=$(brew --prefix)/var/postgres - on 'osx' export DATA_PATH=$(brew --prefix)/var/postgres
@ -104,11 +101,12 @@ script:
# to ensure that slow builds still upload their # to ensure that slow builds still upload their
# ccache results and therefore should be faster # ccache results and therefore should be faster
# (and might work) for the next build # (and might work) for the next build
- DURATION=2400 - DEADLINE=$(( $(date +%s) + 40 * 60 ))
- scripts/travis-command-wrapper.py -s "date" -i 120 --deadline=$(( $(date +%s) + ${DURATION} )) make - scripts/travis-command-wrapper.py -s "date" -i 120 --deadline="$DEADLINE" make
- make test - test_ok && git_submodule_update --init --depth=50 test/
- enabled ${COVERAGE} coverage - test_ok && make test
- enabled ${BENCH} make bench - test_ok && enabled ${COVERAGE} coverage
- test_ok && enabled ${BENCH} make bench
- ./scripts/check_glibcxx.sh - ./scripts/check_glibcxx.sh
after_success: after_success:

4
scripts/travis-common.sh
View file

@ -28,6 +28,10 @@ on () {
esac esac
} }
test_ok () {
return $TRAVIS_TEST_RESULT
}
git_submodule_update () { git_submodule_update () {
git submodule update "$@" && return git submodule update "$@" && return
# failed, search branch and pull request heads for matching commit # failed, search branch and pull request heads for matching commit