September 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 2b1b8bf2cad4af304d38f88e38047dadddd7e0be Merge: b40f9967f 4e4b6a247 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 09:56:19 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 67bdd144bd0bc3d6f063ae8b21c67e3f1cb1fbca Merge: a28c14aad 2b1b8bf2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 09:56:19 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 4ab033c3bc94950ffe442c5f7b5a87f3f3382996 Merge: 0ea622aa3 67bdd144b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 09:56:19 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/master] Travis: when showing a log fails, keep trying to show other logs
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 4e4b6a247661f1ad78de6b07cee3de5bf2a96aa1 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 13:12:54 2018 +1000 Travis: when showing a log fails, keep trying to show other logs When a Travis build fails, and showing a log fails, keep trying to show the other logs. Fixes bug 27453; bugfix on 0.3.4.7-rc. --- .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b8621007..5b0c4baf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -143,11 +143,11 @@ script: after_failure: ## configure will leave a log file with more details of config failures. ## But the log is too long for travis' rendered view, so tail it. - - tail -1000 config.log + - 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; fi + - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog; fi + - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi after_success: ## If this build was one that produced coverage, upload it. diff --git a/changes/bug27453 b/changes/bug27453 new file mode 100644 index 000000000..4501346d2 --- /dev/null +++ b/changes/bug27453 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - When a Travis build fails, and showing a log fails, keep trying to + show the other logs. Fixes bug 27453; bugfix on 0.3.4.7-rc.

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 2b1b8bf2cad4af304d38f88e38047dadddd7e0be Merge: b40f9967f 4e4b6a247 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 09:56:19 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 2f618094d25db35436a1e6962f4f8393d6470a08 Merge: 824160fd8 4ab033c3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 09:56:19 2018 -0400 Merge branch 'maint-0.3.4' .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 67bdd144bd0bc3d6f063ae8b21c67e3f1cb1fbca Merge: a28c14aad 2b1b8bf2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 09:56:19 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 4ab033c3bc94950ffe442c5f7b5a87f3f3382996 Merge: 0ea622aa3 67bdd144b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 09:56:19 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 685232fe1445d94b64c4e74864406f9c77a8592f Merge: 5b072fd46 4e4b6a247 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 09:56:19 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.9] Travis: when showing a log fails, keep trying to show other logs
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 4e4b6a247661f1ad78de6b07cee3de5bf2a96aa1 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 13:12:54 2018 +1000 Travis: when showing a log fails, keep trying to show other logs When a Travis build fails, and showing a log fails, keep trying to show the other logs. Fixes bug 27453; bugfix on 0.3.4.7-rc. --- .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b8621007..5b0c4baf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -143,11 +143,11 @@ script: after_failure: ## configure will leave a log file with more details of config failures. ## But the log is too long for travis' rendered view, so tail it. - - tail -1000 config.log + - 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; fi + - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog; fi + - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi after_success: ## If this build was one that produced coverage, upload it. diff --git a/changes/bug27453 b/changes/bug27453 new file mode 100644 index 000000000..4501346d2 --- /dev/null +++ b/changes/bug27453 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - When a Travis build fails, and showing a log fails, keep trying to + show the other logs. Fixes bug 27453; bugfix on 0.3.4.7-rc.

1 0