August 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.0] Travis: control "make check" with its own flag
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit b0826346a64e58b81e00ec6fcb0d2b75b302c0d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 27 07:51:52 2019 -0500 Travis: control "make check" with its own flag Previously we had "make check" launched whenever DISTCHECK was false. Now we'd like to turn it off in a few other circumstances, like running chutney. Maybe stem too? --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 456b5abc5..a6727923d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ matrix: ## We run coverage with hardening off, which seems like enough # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" + - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -153,7 +153,7 @@ 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 [[ "$SKIP_MAKE_CHECK" == "" ]]; 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' || echo "Coverage failed"; fi @@ -163,7 +163,7 @@ after_failure: ## But the log is too long for travis' rendered view, so tail it. - tail -1000 config.log || echo "tail failed" ## `make check` will leave a log file with more details of test failures. - - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi + - if [[ "$SKIP_MAKE_CHECK" == "" ]]; 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

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit e83eabc9bfb6c07f80611beb6b02d43102806a0e Merge: 1bc2ae7be 5fda19030 Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:17:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5 Merge changed chutney and stem script lines from 29280 with changed stem script lines from 30591. .travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --cc .travis.yml index 66d39f69c,549098439..428c6a000 --- a/.travis.yml +++ b/.travis.yml @@@ -206,11 -209,11 +206,12 @@@ 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" == "" && "$TEST_STEM" == "" ]]; then make check; fi + - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi + - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + - if [[ "$CHUTNEY" != "" ]]; then make test-network-all; fi - ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes - - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --log notice --target RUN_ALL; fi + ## Diagnostic for bug 29437: kill stem if it hangs for 9.5 minutes + ## Travis will kill the job after 10 minutes with no output + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --test control.controller --test control.base_controller --test process --log TRACE --log-file stem.log; 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 @@@ -223,8 -226,8 +224,9 @@@ after_failure ## `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 + - if [[ "$CHUTNEY" != "" ]]; then ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi - - if [[ "$TEST_STEM" != "" ]]; then cat "$STEM_SOURCE_DIR"/test/data/tor_log || echo "cat failed"; fi + - if [[ "$TEST_STEM" != "" ]]; then tail -1000 "$STEM_SOURCE_DIR"/test/data/tor_log || echo "tail failed"; fi + - if [[ "$TEST_STEM" != "" ]]; then grep -v "SocketClosed" stem.log | tail -1000 || echo "grep | tail failed"; fi before_cache: ## Delete all gcov files.

1 0

[tor/release-0.4.0] Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 7b05f19801e333702a6100ce6c3bff4b9e756b21 Merge: afa2c39ba 6bc8dedbe Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:36:15 2019 +1000 Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040 This merge removes an incorrect comment about the stem version and commit script. .travis.yml | 24 +++++++++++++++++------- changes/chutney_ci | 3 +++ 2 files changed, 20 insertions(+), 7 deletions(-)

1 0

[tor/release-0.4.0] Travis: remove a redundant os: linux line
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 75f9ae9029b4244658042ce7a4243202bfb4c527 Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:11:25 2019 +1000 Travis: remove a redundant os: linux line Linux is the first item in the os matrix, so we don't need to specify it under matrix: include: . Part of 29280. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 562036e51..190f43bd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,6 @@ matrix: # We also try running a hardened clang build with chutney on Linux. - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" compiler: clang - os: linux ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 88276ee02c10c202a88766707ecb5e92858270ad Merge: cac910c42 0a661cde1 Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:19:50 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 .travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.0] Travis: SKIP_MAKE_CHECK="yes" when running stem
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 6bc8dedbed31abc40ca3017ac4f26a3373eac40d Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:33:54 2019 +1000 Travis: SKIP_MAKE_CHECK="yes" when running stem And add some comments about stem Part of 29280. --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8493589f7..66d39f69c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ matrix: - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" compiler: clang # We clone our stem repo and run `make test-stem` - - env: TEST_STEM="yes" + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" ## Check rust online with distcheck, to make sure we remove rust products - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" ## Check disable module dirauth with and without rust @@ -75,7 +75,7 @@ matrix: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… allow_failures: ## test-stem sometimes hangs on Travis - - env: TEST_STEM="yes" + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" exclude: ## gcc on OSX is less useful, because the default compiler is clang. @@ -178,6 +178,7 @@ install: - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi ## If we're running chutney, install it. - if [[ "$CHUTNEY" != "" ]]; then git clone --depth 1 https://github.com/torproject/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi + ## If we're running stem, install it. - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; fi ## ## Finally, list installed package versions @@ -194,6 +195,7 @@ install: - python --version ## If we're running chutney, show the chutney commit - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + ## If we're running stem, show the stem version and commit - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script:

1 0

[tor/release-0.4.0] Travis: show the chutney commit and python version
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit ac7ce179834d8d97342fc17bc385730eccc109a8 Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:10:07 2019 +1000 Travis: show the chutney commit and python version Part of 29280. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index cb1351a18..562036e51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -151,6 +151,10 @@ install: ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi + ## Get python version + - python --version + ## If we're running chutney, show the chutney commit + - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi script: - ./autogen.sh

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 0a661cde1d553116937ff4ea9ac09dbc631d7432 Merge: e27a74b1b e83eabc9b Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:19:38 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 97e7be2717290d0d085be74aa59006d0b783b6ec Merge: 2a42d6be2 7b05f1980 Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:07:34 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0 .travis.yml | 24 +++++++++++++++++------- changes/chutney_ci | 3 +++ 2 files changed, 20 insertions(+), 7 deletions(-)

1 0

[tor/release-0.4.1] Travis: remove sudo configuration
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 8f4840b31a5e7b57143f81d726ddfa474ee216aa Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 24 13:29:23 2019 +0300 Travis: remove sudo configuration See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migrati… --- .travis.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 456b5abc5..2ec94c058 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ env: - matrix: - ## include creates builds with gcc, linux, sudo: false + ## include creates builds with gcc, linux include: ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" @@ -53,12 +53,6 @@ matrix: ## allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… exclude: - ## Clang doesn't work in containerized builds, see below. - - compiler: clang - sudo: false - ## Non-containerized gcc are slow and redundant. - - compiler: gcc - sudo: required ## gcc on OSX is less useful, because the default compiler is clang. - compiler: gcc os: osx @@ -68,20 +62,6 @@ matrix: os: linux env: -## We don't need sudo. (The "apt:" stanza after this allows us to not need -## sudo; otherwise, we would need it for getting dependencies.) -## -## But we use "sudo: required" to force non-containerized builds, working -## around a Travis CI environment issue: clang LeakAnalyzer fails -## because it requires ptrace and the containerized environment no -## longer allows ptrace. -## https://github.com/travis-ci/travis-ci/issues/9033 -## -## In the matrix above, we exclude redundant combinations. -sudo: - - false - - required - ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty

1 0