diff options
| author | teor <teor@torproject.org> | 2019-04-01 14:11:20 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-01 14:11:20 +1000 |
| commit | 7014e57f4a05d2be5486aedd754272c70d365354 (patch) | |
| tree | 58ffc93d30794f7955af7d0b85d5741ab4dbdefa /.travis.yml | |
| parent | 3280e9a116df6202dba4e3ee50a9c9d2a1f6699d (diff) | |
| parent | 33be8d8295415491fc06bee47729e86d9efcd126 (diff) | |
| download | tor-7014e57f4a05d2be5486aedd754272c70d365354.tar.gz tor-7014e57f4a05d2be5486aedd754272c70d365354.zip | |
Merge branch 'bug29036-29962-034' into bug29036-29962-035
Merge the moved coverage line from 29036 with the stem changes in
maint-0.3.5.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index b5713d6933..f3ddd81ea1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,10 @@ cache: ## cargo: true directories: - $HOME/.cargo + ## caching CARGO_TARGET_DIR actually slows down the build over time, + ## because old build products are never deleted. ## where we point CARGO_TARGET_DIR in all our cargo invocations - - $TRAVIS_BUILD_DIR/src/rust/target + #- $TRAVIS_BUILD_DIR/src/rust/target compiler: - gcc @@ -204,6 +206,8 @@ script: - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi after_failure: ## configure will leave a log file with more details of config failures. @@ -215,9 +219,12 @@ after_failure: - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi -after_success: - ## If this build was one that produced coverage, upload it. - - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi +before_cache: + ## Delete all gcov files. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi + ## Delete the cargo registry before caching .cargo, because it's cheaper to + ## download the registry and throw it away, rather than caching it + - rm -rf $HOME/.cargo/registry notifications: irc: |