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

[tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit 5b07ff40112390518d95caa90447cd5faf938cf7 Merge: 6a72cc259 c8447f95e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 18:44:31 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+)

1 0

[tor/master] Travis: allow the test-stem job to fail
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit d761c3ca6de62ecdced9933a0717bf3ee598b073 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 19:18:35 2019 +1000 Travis: allow the test-stem job to fail Allow the test-stem job to fail in Travis, because it sometimes hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha. --- .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 89040d822..a1a48baff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,10 @@ 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 diff --git a/changes/bug30744 b/changes/bug30744 new file mode 100644 index 000000000..9f07d4855 --- /dev/null +++ b/changes/bug30744 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Allow the test-stem job to fail in Travis, because it sometimes hangs. + Fixes bug 30744; bugfix on 0.3.5.4-alpha.

1 0

[tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit 5b07ff40112390518d95caa90447cd5faf938cf7 Merge: 6a72cc259 c8447f95e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 18:44:31 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.4.1'
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit cfa943f1406b734aa94dd0930b563500f2f75619 Merge: d6b411a35 5b07ff401 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 18:44:31 2019 -0400 Merge branch 'maint-0.4.1' .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit c8447f95ec202bff9d99941dcdf0dca91e0edc3f Merge: 430dd2da6 d761c3ca6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 18:44:20 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0 .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc .travis.yml index 30e6d9a6b,a1a48baff..7d8877c2a --- 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/release-0.4.0] Travis: allow the test-stem job to fail
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit d761c3ca6de62ecdced9933a0717bf3ee598b073 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 19:18:35 2019 +1000 Travis: allow the test-stem job to fail Allow the test-stem job to fail in Travis, because it sometimes hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha. --- .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 89040d822..a1a48baff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,10 @@ 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 diff --git a/changes/bug30744 b/changes/bug30744 new file mode 100644 index 000000000..9f07d4855 --- /dev/null +++ b/changes/bug30744 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Allow the test-stem job to fail in Travis, because it sometimes hangs. + Fixes bug 30744; bugfix on 0.3.5.4-alpha.

1 0

[tor/release-0.4.1] Travis: allow the test-stem job to fail
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit d761c3ca6de62ecdced9933a0717bf3ee598b073 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 19:18:35 2019 +1000 Travis: allow the test-stem job to fail Allow the test-stem job to fail in Travis, because it sometimes hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha. --- .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 89040d822..a1a48baff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,10 @@ 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 diff --git a/changes/bug30744 b/changes/bug30744 new file mode 100644 index 000000000..9f07d4855 --- /dev/null +++ b/changes/bug30744 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Allow the test-stem job to fail in Travis, because it sometimes hangs. + Fixes bug 30744; bugfix on 0.3.5.4-alpha.

1 0

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

10 Jun '19

commit 66c307751695eb01b6b535462515e66a53ee55a2 Merge: 0fe3b373a c8447f95e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 18:44:31 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+)

1 0

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

10 Jun '19

commit c8447f95ec202bff9d99941dcdf0dca91e0edc3f Merge: 430dd2da6 d761c3ca6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 18:44:20 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0 .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc .travis.yml index 30e6d9a6b,a1a48baff..7d8877c2a --- 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/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit c8447f95ec202bff9d99941dcdf0dca91e0edc3f Merge: 430dd2da6 d761c3ca6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 18:44:20 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0 .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc .travis.yml index 30e6d9a6b,a1a48baff..7d8877c2a --- 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