- tor-commits - lists.torproject.org

[tor/master] Merge branch 'tor-github/pr/879' into maint-0.4.0
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 7fe169a5000d56f081191f4ca073453f2dc3610b Merge: 217db9efe db71bceb4 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 5 14:55:09 2019 +0300 Merge branch 'tor-github/pr/879' into maint-0.4.0 .travis.yml | 15 +++++++++++---- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ changes/ticket29962 | 3 +++ 4 files changed, 22 insertions(+), 5 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'bug29036-029' into bug29036-29962-034
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit ac28e56ccb402d640f5adde186a765265ce855c7 Merge: 6d057c56f 57e9fe2bb Author: teor <teor(a)torproject.org> Date: Mon Apr 1 14:07:58 2019 +1000 Merge branch 'bug29036-029' into bug29036-29962-034 .travis.yml | 8 +++++--- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.0] Run `make reset-gcov` after the script target in Travis CI is done.
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 0267c453e2e0d474f742efa1da3ce698ea4af97d Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Mar 18 15:27:14 2019 +0100 Run `make reset-gcov` after the script target in Travis CI is done. This should ensure that GCDA files are never entering the cache of Travis CI. See: https://bugs.torproject.org/29036 --- .travis.yml | 8 +++++--- changes/bug29036 | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 939f4f4e9..5319bbb89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -155,6 +155,8 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; 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'; fi after_failure: ## configure will leave a log file with more details of config failures. @@ -165,9 +167,9 @@ after_failure: ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || 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 .gcda files. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi notifications: irc: diff --git a/changes/bug29036 b/changes/bug29036 new file mode 100644 index 000000000..4de02adfe --- /dev/null +++ b/changes/bug29036 @@ -0,0 +1,5 @@ + o Minor bugfix (continuous integration): + - Reset coverage state on disk after Travis CI has finished. This is being + done to prevent future gcda file merge errors which causes the test suite + for the process subsystem to fail. Fixes bug 29036; bugfix on 0.4.0.1-alpha. +

1 0

[tor/release-0.4.0] Add changes file
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 124990aa01c8151fad98a6979e5996d5fbb3f51a Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Mar 31 17:23:34 2019 +0300 Add changes file --- changes/ticket29962 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket29962 b/changes/ticket29962 new file mode 100644 index 000000000..e36cc0cf9 --- /dev/null +++ b/changes/ticket29962 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - On Travis Rust builds, cleanup Rust registry and refrain from caching + target/ directory to speed up builds. Resolves issue 29962.

1 0

[tor/master] Merge branch 'bug29036-29962-034' into bug29036-29962-035
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit db71bceb4048c0274001ee46ebab2c60f8d11259 Merge: 7014e57f4 a514e0247 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 12:58:32 2019 +1000 Merge branch 'bug29036-29962-034' into bug29036-29962-035 Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.0] changes: Use the first Tor version with CI coverage for the 29036 changes file
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit eb0bd18d6e344c574614d6d53e2f7cead92c3178 Author: teor <teor(a)torproject.org> Date: Mon Apr 1 13:40:16 2019 +1000 changes: Use the first Tor version with CI coverage for the 29036 changes file Otherwise, "make check-changes" will complain when we backport the change. --- changes/bug29036 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/bug29036 b/changes/bug29036 index 4de02adfe..8b96c5c8f 100644 --- a/changes/bug29036 +++ b/changes/bug29036 @@ -1,5 +1,5 @@ o Minor bugfix (continuous integration): - Reset coverage state on disk after Travis CI has finished. This is being done to prevent future gcda file merge errors which causes the test suite - for the process subsystem to fail. Fixes bug 29036; bugfix on 0.4.0.1-alpha. - + for the process subsystem to fail. The process subsystem was introduced + in 0.4.0.1-alpha. Fixes bug 29036; bugfix on 0.2.9.15.

1 0

[tor/release-0.4.0] Handle errors from coveralls more gracefully.
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit fbb1c7adfcfbda2f7ed6877beb137c382ecb6b50 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Mar 20 15:44:06 2019 +0100 Handle errors from coveralls more gracefully. Since we have moved coveralls to the script target the entire build will now fail if coveralls fail. We handle it more gracefully by echo'ing the failure instead of doing a hard-failure. See: https://bugs.torproject.org/29036 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5319bbb89..336b67d29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,7 +156,7 @@ script: - if [[ "$DISTCHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; 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'; fi + - 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.

1 0

[tor/release-0.4.0] Makefile: delete all the gcov-related files in reset-gcov
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 57e9fe2bbaa66ee907d68cdf7ebcf2111bd71ac9 Author: teor <teor(a)torproject.org> Date: Mon Apr 1 13:49:27 2019 +1000 Makefile: delete all the gcov-related files in reset-gcov And fix a comment. See: https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files --- .travis.yml | 2 +- Makefile.am | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 336b67d29..456b5abc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -168,7 +168,7 @@ after_failure: - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi before_cache: - # Delete all .gcda files. + ## Delete all gcov files. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi notifications: diff --git a/Makefile.am b/Makefile.am index e4be3f26f..4b1687f92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,7 +149,9 @@ test-full: need-stem-path need-chutney-path check test-network test-stem test-full-online: need-stem-path need-chutney-path check test-network test-stem-full reset-gcov: - rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda + rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \ + $(top_builddir)/src/*/*.gcno $(top_builddir)/src/*/*/*.gcno \ + $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov HTML_COVER_DIR=$(top_builddir)/coverage_html coverage-html: all

1 0

[tor/release-0.4.0] Cleanup cargo registry before each Rust-enabled build
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 0c6cfd9c652e4f5074151320ad31c32cc82818e9 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Mar 31 16:58:32 2019 +0300 Cleanup cargo registry before each Rust-enabled build Also, refrain from caching target/. See: https://levans.fr/rust_travis_cache.html --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87780bb1a..4b2a1ffd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,9 @@ cache: ## cargo: true directories: - $HOME/.cargo - ## where we point CARGO_TARGET_DIR in all our cargo invocations - - $TRAVIS_BUILD_DIR/src/rust/target + +before_cache: + - rm -rf $HOME/.cargo/registry compiler: - gcc

1 0

[tor/release-0.4.0] Travis: merge before_cache from 29036 and 29962
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 33be8d8295415491fc06bee47729e86d9efcd126 Author: teor <teor(a)torproject.org> Date: Mon Apr 1 14:05:14 2019 +1000 Travis: merge before_cache from 29036 and 29962 And add some useful comments --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b2a1ffd7..ed805aac3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,10 @@ cache: ## cargo: true directories: - $HOME/.cargo - -before_cache: - - rm -rf $HOME/.cargo/registry + ## 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 compiler: - gcc @@ -217,6 +218,9 @@ after_failure: 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:

1 0