tor-commits November 2018

tor-commits@lists.torproject.org

19 participants
2292 discussions

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 20 Nov '18

20 Nov '18

commit 192966c1592e7f6bdbf3de49234a86a4e2fa9904 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 20 18:45:21 2018 +0000 Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 61 +++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po index e3754eb82..42119ad4f 100644 --- a/locale/ru/LC_MESSAGES/messages.po +++ b/locale/ru/LC_MESSAGES/messages.po @@ -20,11 +20,11 @@ msgstr "" #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:34 msgid "Tor Privacy Policy" -msgstr "Политика приватности Tor" +msgstr "Политика конфиденциальности Tor" #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:44 msgid "Donor privacy policy" -msgstr "Политика приватности в отношении доноров" +msgstr "Политика конфиденциальности доноров" #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:58 msgid "" @@ -160,6 +160,8 @@ msgid "" "The Tor Project very much appreciates all its donors. " "Thank you for supporting Tor." msgstr "" +"The Tor Project очень ценят всех своих доноров. " +"Спасибо, что поддерживаете Tor." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:113 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:658 @@ -233,7 +235,7 @@ msgstr "Tor: Сила в цифрах" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:52 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:75 msgid "Donate to the Tor Project and protect the privacy of millions." -msgstr "" +msgstr "Пожертвуйте Tor Project и защитите конфиденциальность миллионов." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:54 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:77 @@ -242,11 +244,11 @@ msgstr "Анонимность уважает компании." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:63 msgid "summary_large_image" -msgstr "" +msgstr "summary_large_image" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:67 msgid "@torproject" -msgstr "" +msgstr "@torproject" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:102 msgid "" @@ -268,11 +270,11 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:123 msgid "Number of Donations" -msgstr "" +msgstr "Количество Пожертвований" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:139 msgid "Total Donated" -msgstr "" +msgstr "Всего Пожертвованно" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:155 msgid "Total Raised with Mozilla's Match" @@ -314,12 +316,14 @@ msgstr "Выберите подарок как знак нашей призна #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:215 msgid "No thanks, I don't want a gift." -msgstr "" +msgstr "Нет, спасибо. Я не хочу подарок." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:217 #, php-format msgid "I would prefer 100% of my donation to go to the Tor Project's work." msgstr "" +"Я бы предпочел, чтобы 100% моего пожертвования пошли на работу The Tor Project.\n" +" " #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:228 msgid "sticker Pack" @@ -337,7 +341,7 @@ msgstr "футболка" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:253 msgid "Get our limited edition Tor: Strength in Numbers shirt." -msgstr "" +msgstr "Приобретите ограниченный выпуск футболок Tor: Strength in Numbers." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:264 msgid "t-shirt pack" @@ -372,7 +376,7 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:316 msgid "how do you want to DONATE?" -msgstr "" +msgstr "Как вы хотите ПОЖЕРТВОВАТЬ? " #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:322 msgid "Credit Card" @@ -380,7 +384,7 @@ msgstr "Кредитная карта" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:338 msgid "Your Info" -msgstr "" +msgstr "Ваша Информация" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:342 msgid "* required fields" @@ -490,11 +494,11 @@ msgstr "Толстовка" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:500 msgid "A required field is missing from the form." -msgstr "" +msgstr "В форме отсутствует обязательное поле." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:502 msgid "Please reload the page and try again." -msgstr "" +msgstr "Пожалуйста, обновите страницу и попробуйте снова." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:506 msgid "There was a problem submitting your request to the server: " @@ -509,6 +513,8 @@ msgstr "ошибка при проверке" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:516 msgid "__field_name__ must be filled out." msgstr "" +"Поле __field_name__ должно быть заполнено.\n" +" " #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:521 msgid "This field is required" @@ -574,11 +580,11 @@ msgstr "РАССКАЖИТЕ О TOR PROJECT" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:88 msgid "Got Skills?" -msgstr "" +msgstr "Имеете Навыки?" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:94 msgid "The Tor network depends on volunteers." -msgstr "" +msgstr "Сеть Tor зависит от волонтёров." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:100 msgid "" @@ -588,19 +594,19 @@ msgstr "" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:102 msgid "Learn how you can help." -msgstr "" +msgstr "Узнайте как вы можете помочь." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:110 msgid "I Want To Volunteer" -msgstr "" +msgstr "Я Хочу быть Волонтёром" #: tmp/cache_locale/92/9248b30ecfc0bb3509fc7e1db98f98ec86e72399ad551da3d5abe54c7cd987af.php:34 msgid "Processing Donation - Tor" -msgstr "" +msgstr "Обрабатываем Пожертвование - Tor" #: tmp/cache_locale/92/9248b30ecfc0bb3509fc7e1db98f98ec86e72399ad551da3d5abe54c7cd987af.php:44 msgid "Processing Donation. Please Wait..." -msgstr "" +msgstr "Обрабатываем Пожертвование. Пожалуйста Подождите..." #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:25 msgid "" @@ -617,7 +623,7 @@ msgstr "" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:31 msgid "Subscribe to Our Newsletter" -msgstr "" +msgstr "Подпишитесь На Нашу Рассылку" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:35 msgid "Get monthly updates and opportunities from the Tor Project." @@ -625,11 +631,11 @@ msgstr "" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:39 msgid "Sign Up" -msgstr "" +msgstr "Зарегистрироваться" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:47 msgid "Donate FAQs" -msgstr "" +msgstr "Пожертвования FAQ" #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:51 msgid "Privacy Policy" @@ -663,7 +669,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:68 msgid "What is the Tor Project and what does it do?" -msgstr "" +msgstr "Что такое Tor Project и чем они занимается?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:72 msgid "" @@ -679,20 +685,25 @@ msgid "" "href=\"https://www.torproject.org/download/download-easy.html.en\">Tor " "Browser</a>, which enables people to browse the internet anonymously." msgstr "" +"Главный продукт Tor Project это <a " +"href=\"https://www.torproject.org/download/download-easy.html.en\">Tor " +"Browser</a>, который позволяет людям анонимно пользоваться интернетом." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:76 msgid "" "The Tor Project is a 501(c)3 tax-exempt non-profit organization based in " "Boston, Massachusetts." msgstr "" +"The Tor Project это 501(c)3 налогово-льготная некомерческая организация " +"основанная в Бостон, Массачусетс," #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:78 msgid "It was founded in 2006." -msgstr "" +msgstr "Она была основана в 2006 году." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:84 msgid "Who works for the Tor Project, and what do they do?" -msgstr "" +msgstr "Кто работают в Tor Project, и чем они занимаются?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:88 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 20 Nov '18

20 Nov '18

commit 612124d52fafb1e61660ef204a21314ae50a791d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 20 18:15:19 2018 +0000 Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po index a9f93eee9..e3754eb82 100644 --- a/locale/ru/LC_MESSAGES/messages.po +++ b/locale/ru/LC_MESSAGES/messages.po @@ -9,10 +9,11 @@ # erinm, 2018 # Katrin Kutepova <blackkatelv(a)gmail.com>, 2018 # Legenden Rifk <rekytcsgo(a)gmail.com>, 2018 +# Vladislav Berg <vladislavp(a)tuta.io>, 2018 # msgid "" msgstr "" -"Last-Translator: Legenden Rifk <rekytcsgo(a)gmail.com>, 2018\n" +"Last-Translator: Vladislav Berg <vladislavp(a)tuta.io>, 2018\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" @@ -29,6 +30,8 @@ msgstr "Политика приватности в отношении донор msgid "" "The Tor Project respects donor privacy and welcomes anonymous donations." msgstr "" +"The Tor Project уважает конфиденциальность донора и приветствует анонимные " +"пожертвования." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:60 msgid "" @@ -65,6 +68,9 @@ msgid "" "links\" target=\"_blank\" href=\"https://www.paypal.com/webapps/mpp/ua" "/privacy-full\">policies</a>, especially if you have privacy concerns." msgstr "" +"Мы советуем вам ознакомиться с их <a class=\"hyperlinks links\" " +"target=\"_blank\" href=\"https://www.paypal.com/webapps/mpp/ua/privacy-" +"full\">политикой</a>, в случае беспокойства о конфиденциальности." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:74 msgid "" @@ -82,6 +88,7 @@ msgid "" "We may also learn incidental data such as the date and time of your " "donation." msgstr "" +"Мы также имеем доступ к информации о дате и времени вашего пожертвования." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:78 msgid ""

1 0

[tor/master] build: Revert "Use -lresolv in LIBS with rust on OSX."
by nickm＠torproject.org 20 Nov '18

20 Nov '18

commit a9733a32d35205274d6e808cd846688576ab0b6a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 24 02:16:28 2018 +0000 build: Revert "Use -lresolv in LIBS with rust on OSX." This reverts commit 2ac9734bd21f3eecb20560cde5c4037230029157. * FIXES #25341: https://bugs.torproject.org/25341 Signed-off-by: Isis Lovecruft <isis(a)torproject.org> --- Makefile.am | 3 +-- configure.ac | 11 ----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 04ca88a23..02ccbd91b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,8 +26,7 @@ TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT) endif if USE_RUST -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@ \ - @TOR_RUST_EXTRA_LIBS@ +rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ else rust_ldadd= endif diff --git a/configure.ac b/configure.ac index 22c8a5613..d00e1f74b 100644 --- a/configure.ac +++ b/configure.ac @@ -468,15 +468,6 @@ if test "x$enable_rust" = "xyes"; then fi fi - dnl This is a workaround for #46797 - dnl (a.k.a https://github.com/rust-lang/rust/issues/46797 ). Once the - dnl upstream bug is fixed, we can remove this workaround. - case "$host_os" in - darwin*) - TOR_RUST_EXTRA_LIBS="-lresolv" - ;; - esac - dnl For now both MSVC and MinGW rust libraries will output static libs with dnl the MSVC naming convention. if test "$bwin32" = "true"; then @@ -503,8 +494,6 @@ if test "x$enable_rust" = "xyes"; then AC_MSG_RESULT([$RUSTC_VERSION]) fi -AC_SUBST(TOR_RUST_EXTRA_LIBS) - AC_SEARCH_LIBS(socket, [socket network]) AC_SEARCH_LIBS(gethostbyname, [nsl]) AC_SEARCH_LIBS(dlopen, [dl])

1 0

[tor/master] build: Fix Makefile.am TOR_RUST_STATIC_NAME variable name after revert.
by nickm＠torproject.org 20 Nov '18

20 Nov '18

commit af3e5bed1084fa321e90eaf87e5dc9a7256dd920 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 24 02:17:36 2018 +0000 build: Fix Makefile.am TOR_RUST_STATIC_NAME variable name after revert. * FIXES #25341: https://bugs.torproject.org/25341 --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 02ccbd91b..2c6de3574 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT) endif if USE_RUST -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ +rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@ else rust_ldadd= endif

1 0

[tor/master] Merge branch 'ticket25341_merged_v2'
by nickm＠torproject.org 20 Nov '18

20 Nov '18

commit b406fdae4fff9a6495a9ad319e7f2b565de52ac8 Merge: 56f24889a a4f207517 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 20 13:14:56 2018 -0500 Merge branch 'ticket25341_merged_v2' Makefile.am | 4 +--- configure.ac | 11 ----------- 2 files changed, 1 insertion(+), 14 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'isis/bug25341' into ticket25341_merged_v2
by nickm＠torproject.org 20 Nov '18

20 Nov '18

commit a4f2075170b4ba58becee26031d5192d42a96040 Merge: a8df39e95 af3e5bed1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 19 09:22:30 2018 -0500 Merge remote-tracking branch 'isis/bug25341' into ticket25341_merged_v2 Makefile.am | 4 +--- configure.ac | 11 ----------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --cc Makefile.am index cb76edfa2,2c6de3574..803e9d00d --- a/Makefile.am +++ b/Makefile.am @@@ -31,9 -26,7 +31,7 @@@ TESTING_TOR_BINARY=$(top_builddir)/src/ endif if USE_RUST - ## this MUST be $(), otherwise am__DEPENDENCIES will not track it - rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH) \ - $(TOR_RUST_EXTRA_LIBS) -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@ ++rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH) else rust_ldadd= endif

1 0

[tor/maint-0.3.4] Appveyor: always show the logs, and upload them as build artifacts
by nickm＠torproject.org 20 Nov '18

20 Nov '18

commit b8ce1de4bf55c7cbd786c4597638bfcb543c5f11 Author: teor <teor(a)torproject.org> Date: Thu Nov 15 21:04:17 2018 +1000 Appveyor: always show the logs, and upload them as build artifacts Always show the configure and test logs, and upload them as build artifacts, when building for Windows using Appveyor CI. Implements 28459. --- .appveyor.yml | 4 +++- changes/ticket28459 | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7d8927ee3..21ae27767 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -60,7 +60,7 @@ test_script: Execute-Bash "VERBOSE=1 make -j2 check" } -on_failure: +on_finish: - ps: >- if ($env:compiler -eq "mingw") { $oldpath = ${env:Path} -split ';' @@ -73,4 +73,6 @@ on_failure: Execute-Bash "tail -1000 config.log || true" Execute-Bash "cat test-suite.log || true" } + +on_failure: - 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/ticket28459 b/changes/ticket28459 new file mode 100644 index 000000000..6b5839b52 --- /dev/null +++ b/changes/ticket28459 @@ -0,0 +1,4 @@ + o Minor features (continuous integration, Windows): + - Always show the configure and test logs, and upload them as build + artifacts, when building for Windows using Appveyor CI. + Implements 28459.

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 20 Nov '18

20 Nov '18

commit a9820f072bf1bd796651e9e3913988e6224bd524 Merge: 0489288aa 9da8cd0bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 20 13:10:38 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 .appveyor.yml | 4 +++- changes/ticket28459 | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Appveyor: always show the logs, and upload them as build artifacts
by nickm＠torproject.org 20 Nov '18

20 Nov '18

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'teor/ticket28459-034' into maint-0.3.4
by nickm＠torproject.org 20 Nov '18

20 Nov '18

commit 9da8cd0bc35920bc1492efd3312d05f147fc7f7e Merge: fe1fb4b0c b8ce1de4b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 20 13:10:18 2018 -0500 Merge remote-tracking branch 'teor/ticket28459-034' into maint-0.3.4 .appveyor.yml | 4 +++- changes/ticket28459 | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --cc .appveyor.yml index f76a9f0a9,21ae27767..0bb93316f --- a/.appveyor.yml +++ b/.appveyor.yml @@@ -70,10 -60,9 +70,10 @@@ test_script Execute-Bash "VERBOSE=1 make -j2 check" } - on_failure: + on_finish: - ps: >- if ($env:compiler -eq "mingw") { + <# use the MSYS2 user binaries to archive failures #> $oldpath = ${env:Path} -split ';' $buildpath = @("C:\msys64\usr\bin") + $oldpath $env:Path = @($buildpath) -join ';' @@@ -85,5 -73,6 +85,7 @@@ Execute-Bash "tail -1000 config.log || true" Execute-Bash "cat test-suite.log || true" } + +# notify the IRC channel of any failures + on_failure: - cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2018