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

[tor/maint-0.3.2] Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit ff1486385aed1172c18a8a593dec2684de891f60 Merge: 4e4b6a247 35b0ac8d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:14:56 2018 -0400 Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 05 Sep '18

05 Sep '18

commit 38bbee58df5ee7ced174d313cc6908cef7eea179 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 5 14:15:11 2018 +0000 Update translations for bridgedb --- pa/LC_MESSAGES/bridgedb.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pa/LC_MESSAGES/bridgedb.po b/pa/LC_MESSAGES/bridgedb.po index 98ee45157..2bdfec49a 100644 --- a/pa/LC_MESSAGES/bridgedb.po +++ b/pa/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-08-27 12:39+0000\n" +"PO-Revision-Date: 2018-09-05 14:15+0000\n" "Last-Translator: KAMALJEET SINGH\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n" "MIME-Version: 1.0\n" @@ -92,32 +92,32 @@ msgstr "ਇਸ ਵੇਲੇ ਕੋਈ ਵੀ ਪੁਲ ਉਪਲਬੱਧ ਨਹ msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "ਸ਼ਾਇਦ ਤੁਹਾਨੂੰ %s ਵਾਪਸ ਜਾ %s ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਪਵੇਗੀ ਅਤੇ ਇੱਕ ਵੱਖਰੇ ਪੁਲ ਦੀ ਕਿਸਮ ਦੀ ਚੋਣ ਕਰੋ!" #: bridgedb/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "ਕਦਮ %s 1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "ਡਾਉਨਲੋਡ %s ਟੋਰ ਬ੍ਰਾਉਜ਼ਰ %s" #: bridgedb/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "ਕਦਮ %s 2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "ਪੁਲ %s ਲਵੋ %s" #: bridgedb/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "ਕਦਮ %s 3 %s" #: bridgedb/https/templates/index.html:38 #, python-format

1 0

[tor/maint-0.3.4] Appveyor: always log the compiler path and version
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 90e038e7321deefb93b75fc95e6807e2d3482ca6 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 10:17:39 2018 +1000 Appveyor: always log the compiler path and version Implements 27449. --- .appveyor.yml | 2 ++ changes/ticket27449 | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index d1d8d7c45..7cc86004b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -39,6 +39,8 @@ build_script: Execute-Bash 'autoreconf -i' mkdir "${env:build}" Set-Location "${env:build}" + Execute-Bash "which ${env:target}-gcc" + Execute-Bash "${env:target}-gcc --version" Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" diff --git a/changes/ticket27449 b/changes/ticket27449 new file mode 100644 index 000000000..2a0984c09 --- /dev/null +++ b/changes/ticket27449 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Log the compiler path and version during Appveyor builds. + Implements ticket 27449.

1 0

[tor/maint-0.3.4] Appveyor: tail config.log and cat test-suite.log after failed builds
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit d3a3ac013d44dadf335acc27adcec62abfb69dc8 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 10:44:01 2018 +1000 Appveyor: tail config.log and cat test-suite.log after failed builds Also zip the full logs, and upload them as build artifacts. Implements ticket 27430. --- .appveyor.yml | 13 ++++++++++++- changes/ticket27430 | 4 ++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7cc86004b..690f93e5b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -57,5 +57,16 @@ test_script: } on_failure: +- ps: >- + if ($env:compiler -eq "mingw") { + $oldpath = ${env:Path} -split ';' + $buildpath = @("C:\msys64\usr\bin") + $oldpath + $env:Path = @($buildpath) -join ';' + Set-Location "${env:build}" + Execute-Bash "7z a logs.zip config.log || true" + Execute-Bash "7z a logs.zip test-suite.log || true" + Execute-Bash "appveyor PushArtifact logs.zip || true" + Execute-Bash "tail -1000 config.log || true" + Execute-Bash "cat test-suite.log || true" + } - cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure - diff --git a/changes/ticket27430 b/changes/ticket27430 new file mode 100644 index 000000000..4e016e91e --- /dev/null +++ b/changes/ticket27430 @@ -0,0 +1,4 @@ + o Minor features (continuous integration): + - Show config.log and test-suite.log after failed Appveyor builds. + Also upload the zipped full logs as a build artifact. + Implements ticket 27430.

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit b390983b27df728564905b3c052c3d68ace8bea0 Merge: 4ab033c3b d3a3ac013 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:01:27 2018 -0400 Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4 .appveyor.yml | 15 ++++++++++++++- changes/ticket27430 | 4 ++++ changes/ticket27449 | 3 +++ 3 files changed, 21 insertions(+), 1 deletion(-)

1 0

[tor/master] Appveyor: tail config.log and cat test-suite.log after failed builds
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit d3a3ac013d44dadf335acc27adcec62abfb69dc8 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 10:44:01 2018 +1000 Appveyor: tail config.log and cat test-suite.log after failed builds Also zip the full logs, and upload them as build artifacts. Implements ticket 27430. --- .appveyor.yml | 13 ++++++++++++- changes/ticket27430 | 4 ++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7cc86004b..690f93e5b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -57,5 +57,16 @@ test_script: } on_failure: +- ps: >- + if ($env:compiler -eq "mingw") { + $oldpath = ${env:Path} -split ';' + $buildpath = @("C:\msys64\usr\bin") + $oldpath + $env:Path = @($buildpath) -join ';' + Set-Location "${env:build}" + Execute-Bash "7z a logs.zip config.log || true" + Execute-Bash "7z a logs.zip test-suite.log || true" + Execute-Bash "appveyor PushArtifact logs.zip || true" + Execute-Bash "tail -1000 config.log || true" + Execute-Bash "cat test-suite.log || true" + } - cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure - diff --git a/changes/ticket27430 b/changes/ticket27430 new file mode 100644 index 000000000..4e016e91e --- /dev/null +++ b/changes/ticket27430 @@ -0,0 +1,4 @@ + o Minor features (continuous integration): + - Show config.log and test-suite.log after failed Appveyor builds. + Also upload the zipped full logs as a build artifact. + Implements ticket 27430.

1 0

[tor/master] Appveyor: always log the compiler path and version
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 90e038e7321deefb93b75fc95e6807e2d3482ca6 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 10:17:39 2018 +1000 Appveyor: always log the compiler path and version Implements 27449. --- .appveyor.yml | 2 ++ changes/ticket27449 | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index d1d8d7c45..7cc86004b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -39,6 +39,8 @@ build_script: Execute-Bash 'autoreconf -i' mkdir "${env:build}" Set-Location "${env:build}" + Execute-Bash "which ${env:target}-gcc" + Execute-Bash "${env:target}-gcc --version" Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" diff --git a/changes/ticket27449 b/changes/ticket27449 new file mode 100644 index 000000000..2a0984c09 --- /dev/null +++ b/changes/ticket27449 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Log the compiler path and version during Appveyor builds. + Implements ticket 27449.

1 0

[tor/master] Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit b390983b27df728564905b3c052c3d68ace8bea0 Merge: 4ab033c3b d3a3ac013 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:01:27 2018 -0400 Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4 .appveyor.yml | 15 ++++++++++++++- changes/ticket27430 | 4 ++++ changes/ticket27449 | 3 +++ 3 files changed, 21 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit b390983b27df728564905b3c052c3d68ace8bea0 Merge: 4ab033c3b d3a3ac013 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 5 10:01:27 2018 -0400 Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4 .appveyor.yml | 15 ++++++++++++++- changes/ticket27430 | 4 ++++ changes/ticket27449 | 3 +++ 3 files changed, 21 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Appveyor: always log the compiler path and version
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 90e038e7321deefb93b75fc95e6807e2d3482ca6 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 10:17:39 2018 +1000 Appveyor: always log the compiler path and version Implements 27449. --- .appveyor.yml | 2 ++ changes/ticket27449 | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index d1d8d7c45..7cc86004b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -39,6 +39,8 @@ build_script: Execute-Bash 'autoreconf -i' mkdir "${env:build}" Set-Location "${env:build}" + Execute-Bash "which ${env:target}-gcc" + Execute-Bash "${env:target}-gcc --version" Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" diff --git a/changes/ticket27449 b/changes/ticket27449 new file mode 100644 index 000000000..2a0984c09 --- /dev/null +++ b/changes/ticket27449 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Log the compiler path and version during Appveyor builds. + Implements ticket 27449.

1 0