- tor-commits - lists.torproject.org

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

05 Apr '19

commit 2cc3c98bc4fbdbb1cd11bae2d98f3f26164d1799 Merge: 7fe169a50 ef06ef217 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 5 14:56:52 2019 +0300 Merge branch 'tor-github/pr/901' into maint-0.4.0 .travis.yml | 13 ++++++++++--- changes/bug30011 | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --cc .travis.yml index d7db65bed,498069d82..bda1f323e --- a/.travis.yml +++ b/.travis.yml @@@ -209,10 -213,9 +215,11 @@@ script - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi - - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi + ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes + - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -T 30 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.

1 0

[tor/release-0.4.0] Travis: Terminate test-stem if it takes more than 9.5 minutes to run
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit 3fa42d599a205e51c91efb953af70a45e877eafe Author: teor <teor(a)torproject.org> Date: Thu Apr 4 13:02:13 2019 +1000 Travis: Terminate test-stem if it takes more than 9.5 minutes to run (Travis terminates the job after 10 minutes of no output.) Diagnostic for 29437. Fixes bug 30011; bugfix on 0.3.5.4-alpha. --- .travis.yml | 9 ++++++++- changes/bug30011 | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b5713d693..e70344ee2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -131,6 +131,9 @@ addons: - docbook-xsl - docbook-xml - xmlto + ## Utilities + ## preventing or diagnosing hangs + - timelimit ## (OSX only) homebrew: packages: @@ -154,6 +157,9 @@ addons: ## Always installed, because manual brew installs are hard to get right - asciidoc - xmlto + ## Utilities + ## preventing or diagnosing hangs + - timelimit ## (OSX only) Use the default OSX image ## See https://docs.travis-ci.com/user/reference/osx#os-x-version @@ -202,7 +208,8 @@ script: - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi - - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi + ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes + - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -T 30 make src/app/tor test-stem; fi - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure: diff --git a/changes/bug30011 b/changes/bug30011 new file mode 100644 index 000000000..4c9069e29 --- /dev/null +++ b/changes/bug30011 @@ -0,0 +1,4 @@ + o Minor bugfixes (CI): + - Terminate test-stem if it takes more than 9.5 minutes to run. + (Travis terminates the job after 10 minutes of no output.) + Diagnostic for 29437. Fixes bug 30011; bugfix on 0.3.5.4-alpha.

1 0

[tor/release-0.4.0] Merge branch 'bug30011_035' into bug30011_040
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit ef06ef217a828e3c34358bc53da41932bc129017 Merge: 9242f3288 3fa42d599 Author: teor <teor(a)torproject.org> Date: Thu Apr 4 13:23:26 2019 +1000 Merge branch 'bug30011_035' into bug30011_040 Merge bug30011 new package timelimit with 0.4.0 new package shellcheck. Move shellcheck into the correct category. .travis.yml | 13 ++++++++++--- changes/bug30011 | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --cc .travis.yml index 474f6867f,e70344ee2..498069d82 --- a/.travis.yml +++ b/.travis.yml @@@ -125,6 -125,6 +125,7 @@@ addons - libseccomp-dev ## zstd doesn't exist in Ubuntu Trusty #- libzstd ++ - shellcheck ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc @@@ -151,6 -153,6 +154,7 @@@ - pkg-config ## Optional build dependencies - ccache ++ - shellcheck ## Conditional build dependencies ## Always installed, because manual brew installs are hard to get right - asciidoc

1 0

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

05 Apr '19

commit 0ba45b2977190516cecf7da08f1bb4045aa92c5b Merge: 5ac287877 2cc3c98bc Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 5 14:57:06 2019 +0300 Merge branch 'maint-0.4.0' into release-0.4.0 .travis.yml | 13 ++++++++++--- changes/bug30011 | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/master] 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/master] 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

[tor/master] 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 7014e57f4a05d2be5486aedd754272c70d365354 Merge: 3280e9a11 33be8d829 Author: teor <teor(a)torproject.org> Date: Mon Apr 1 14:11:20 2019 +1000 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. .travis.yml | 15 +++++++++++---- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ changes/ticket29962 | 3 +++ 4 files changed, 22 insertions(+), 5 deletions(-) diff --cc .travis.yml index b5713d693,ed805aac3..f3ddd81ea --- a/.travis.yml +++ b/.travis.yml @@@ -201,9 -201,10 +203,11 @@@ script - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## 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 [[ "$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. @@@ -213,11 -214,13 +217,14 @@@ - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - 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:

1 0

[tor/master] Makefile: actually, don't delete the gcno files
by asn＠torproject.org 05 Apr '19

05 Apr '19

commit f0cd8f804f8152355993acf0493b22b668f500b2 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 12:56:29 2019 +1000 Makefile: actually, don't delete the gcno files We need to keep the gcno files, because they are created at compile time. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 4b1687f92..48d3df265 100644 --- a/Makefile.am +++ b/Makefile.am @@ -148,9 +148,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 +# We can't delete the gcno files, because they are created when tor is compiled reset-gcov: 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

1 0

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

05 Apr '19

commit a514e024769083908a35f28ac0df5f2e7b1137b8 Merge: 33be8d829 f0cd8f804 Author: teor <teor(a)torproject.org> Date: Fri Apr 5 12:58:16 2019 +1000 Merge branch 'bug29036-029' into bug29036-29962-034 Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0