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

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

11 Jun '19

commit 50dcbf26122d82eb8a6e6b41db82d88608eadd32 Merge: 66c307751 4ca18fde9 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:52:32 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0

1 0

[tor/release-0.4.1] Add changes file
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit 6b2d8b1a7c81cce0ee357ba74e494f1438ef3cbf Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Apr 21 21:06:57 2019 +0300 Add changes file --- changes/ticket30213 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30213 b/changes/ticket30213 new file mode 100644 index 000000000..acb761480 --- /dev/null +++ b/changes/ticket30213 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Remove sudo configuration lines from .travis.yml as they are no longer + needed with current Travis build environment. Resolves issue 30213.

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit a58c4cc6dd905acb5ab5c29c0152e792b27dd428 Merge: cb20054cc 9a97b5ff5 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:47:40 2019 +1000 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+)

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit cb20054ccda422ddf5af29d4bf5c55fa3a701e1f Merge: e5deb2bbc 12b9bfc05 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:46:24 2019 +1000 Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 changes/ticket29702 | 4 ++++ src/test/test_key_expiration.sh | 3 ++- src/test/test_keygen.sh | 3 ++- src/test/test_rebind.py | 10 +++++++++- src/test/zero_length_keys.sh | 3 ++- 5 files changed, 19 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit dcb8cad4e65022820c1660838e72b5b5ea67f850 Merge: a742a80ee d761c3ca6 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:51:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc .travis.yml index 3c0a3a02a,a1a48baff..861b37f08 --- a/.travis.yml +++ b/.travis.yml @@@ -70,7 -70,17 +70,11 @@@ matrix ## Careful! We use global envs, which makes it hard to exclude or ## allow failures by env: ## 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" + 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

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit cb20054ccda422ddf5af29d4bf5c55fa3a701e1f Merge: e5deb2bbc 12b9bfc05 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:46:24 2019 +1000 Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 changes/ticket29702 | 4 ++++ src/test/test_key_expiration.sh | 3 ++- src/test/test_keygen.sh | 3 ++- src/test/test_rebind.py | 10 +++++++++- src/test/zero_length_keys.sh | 3 ++- 5 files changed, 19 insertions(+), 4 deletions(-)

1 0

[tor/master] Travis: remove sudo configuration
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit 5c00b25c0e63380ec175353f8f389d9bede31a5a 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 89040d822..d8faafec0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ env: - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true 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="" @@ -71,12 +71,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 @@ -92,20 +86,6 @@ matrix: ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" -## 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

[tor/master] Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit a58c4cc6dd905acb5ab5c29c0152e792b27dd428 Merge: cb20054cc 9a97b5ff5 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:47:40 2019 +1000 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit 202ccc3930be8d93424303cc13a5c80c58c07817 Merge: a58c4cc6d 6b2d8b1a7 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:48:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 .travis.yml | 22 +--------------------- changes/ticket30213 | 3 +++ 2 files changed, 4 insertions(+), 21 deletions(-)

1 0

[tor/master] Add changes file
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit 6b2d8b1a7c81cce0ee357ba74e494f1438ef3cbf Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Apr 21 21:06:57 2019 +0300 Add changes file --- changes/ticket30213 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30213 b/changes/ticket30213 new file mode 100644 index 000000000..acb761480 --- /dev/null +++ b/changes/ticket30213 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Remove sudo configuration lines from .travis.yml as they are no longer + needed with current Travis build environment. Resolves issue 30213.

1 0