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

[translation/snowflake-website-indexhtml_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml_completed
by translation＠torproject.org 17 Oct '19

17 Oct '19

commit a561b7220756f6aae2b8ca754e37ce5dab5e7b43 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 06:17:36 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-i… --- tr/index.html | 79 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/tr/index.html b/tr/index.html index 66b3aa2a8..9f40b07ec 100644 --- a/tr/index.html +++ b/tr/index.html @@ -1,74 +… [View More]1,83 @@ <!doctype html> -<html lang="tr"> +<html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Snowflake</title> -<link rel="icon" href="assets/favicon.ico"> -<link rel="stylesheet" href="index.css"> +<link rel="icon" href="./assets/favicon.ico"> +<link rel="stylesheet" href="./bootstrap.css"> +<link rel="stylesheet" href="./index.css"> </head> -<body> - <header id="header"><a href="https://www.torproject.org/"> - <img src="tor-logo(a)2x.png" alt="Tor" height="50"></a></header><section id="content"><h1>SNOWFLAKE</h1> +<body class="no-gutters"> + <header id="header"><nav class="navbar no-background navbar-dark bg-dark p-4"><a class="navbar-brand" href="https://www.torproject.org/"> + <img src="./tor-logo(a)2x.png" alt="Tor" height="50"></a><div class="btn-group dropdown pull-right"> +<button id="language-switcher" type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + </button><div id="supported-languages" class="dropdown-menu"> + </div> + </div> + </nav></header><div> + <section id="content"><h1>SNOWFLAKE</h1> - <p class="diagram"><img src="https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/…" alt="Diagram"></p> + <p class="diagram"><img src="https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/…" alt="Diagram"></p> - <p>Snowflake İnternet sansürünü aşmaya yönelik bir sistemdir. Sansüre uğrayan - kişiler, Snowflake kullanarak İnternete erişebilir. Bağlantı, gönüllüler tarafından - işletilen Snowflake vekil sunucuları üzerinden kurulur. Snowflake hakkında - information about how Snowflake works see our - <a href="https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/">viki</a> sayfamıza bakabilirsiniz.</p> + <p data-msgid="__MSG_websiteIntro__">Snowflake İnternet sansürünü aşmaya yönelik bir sistemdir. + Sansüre uğrayan kişiler, Snowflake kullanarak İnternete erişebilir. + Bağlantı, gönüllüler tarafından işletilen Snowflake vekil sunucuları ile sağlanır. + Snowflake hakkında ayrıntılı bilgi almak için + <a href="https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/" data-msgid="__MSG_docWiki__">Viki</a> sayfamıza bakabilirsiniz.</p> - <div class="sidebyside"> + <div class="sidebyside"> - <section id="browser" class="browser"><h2>Tarayıcı</h2> + <section id="browser" class="browser"><h2 data-msgid="__MSG_browser__">Tarayıcı</h2> - <p>İnternet erişiminiz sansürleniyorsa + <p data-msgid="__MSG_censoredUsers__">İnternet erişiminiz sansürleniyorsa <a href="https://www.torproject.org/download/">Tor Browser</a> uygulamasını indirmelisiniz.</p> - <p class="screenshot"><img src="screenshot.png" alt="Tor Browser screenshot"></p> - </section><section id="extension" class="extension"><h2>Eklenti</h2> + <p class="screenshot"><img src="./screenshot.png" alt="Tor Browser ekran görüntüsü"></p> + </section><section id="extension" class="extension"><h2 data-msgid="__MSG_extension__">Eklenti</h2> - <p>İnternet erişiminiz <strong>sansürlenmiyorsa</strong>, sansürlenen ağlardaki + <p data-msgid="__MSG_installExtension__">İnternet erişiminiz <strong>sansürlenmiyorsa</strong>, sansürlenen ağlardaki kullanıcılara yardımcı olmak için Snowflake eklentisini kurabilirsiniz. Diğer kullanıcıların vekil sunucunuz üzerinden eriştiği sayfalar hakkında endişelenmeniz gerekmez. Bu kullanıcıların görülebilecek IP adresleri sizin değil Tor çıkış durağının adresi olur.</p> - <p class="addon"><a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/"> - <img src="firefox150.jpg" alt="Install in Firefox" height="100"><br><span>Firefox üzerine kur</span> + <p class="addon"><a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/"> + <img src="./firefox150.jpg" alt="Firefox üzerine kurulum" height="100"><br><span data-msgid="MSG_installFirefox__">Firefox üzerine kurulum</span> </a> <a href="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmma…"> - <img src="chrome150.jpg" alt="Install in Chrome" height="100"><br><span>Chrome üzerine kur</span> + <img src="./chrome150.jpg" alt="Chrome üzerine kurulum" height="100"><br><span data-msgid="__MSG_installChrome__">Chrome üzerine kurulum</span> </a></p> - </section> + </section> </div> - <section id="bugs"><h2>HATA BİLDİRİMİ</h2> + <section id="bugs"><h2 data-msgid="__MSG_reportingBugs__">Hata Bildirimi</h2> - <p>Bir istemci ya da vekil sunucu olarak Snowflake kullanırken sorun - yaşarsanız, hata bildirimi gönderebilirsiniz. Bunun için,</p> + <p data-msgid="__MSG_fileBug__">Bir istemci ya da vekil sunucu olarak Snowflake kullanırken sorun + yaşarsanız, hata bildiriminde bulunmanız iyi olur. Bunun için,</p> - <ol> -<li> <a href="https://trac.torproject.org/projects/tor/register">bir hesap + <ol> +<li data-msgid="__MSG_sharedAccount__"> <a href="https://trac.torproject.org/projects/tor/register">bir hesap açabilir</a> ya da <a href="https://trac.torproject.org/projects/tor/login">oturum açmak</a> için paylaşılan <b>cypherpunks</b> hesabı ve <b>writecode</b> parolasını kullanabilirsiniz.</li> - <li> + <li data-msgid="__MSG_bugTracker__"> <a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">Kayıt açmak için</a> hata izleyicimizi kullanabilirsiniz.</li> - </ol> -<p>Lütfen bildirim kaydında olabildiğince açıklayıcı olun ve yapabiliyorsanız + </ol> +<p data-msgid="__MSG_descriptive__">Lütfen bildirim kaydında olabildiğince açıklayıcı olun ve yapabiliyorsanız hatayı yeniden oluşturmamıza yardımcı olabilecek günlük iletilerini ekleyin. Sorunun Snowflake sisteminin hangi parçasında yaşandığını bildirmek için <em>snowflake-webextension</em> ya da <em>snowflake-client</em> anahtar sözcüklerini ekleyebilirsiniz.</p> - </section><section id="embed"><h2>YERLEŞTİRME</h2> + </section><section id="embed"><h2 data-msgid="__MSG_embed__">Ekleme</h2> - <p>Artık Snowflake amblemini herhangi bir web sitesine ekleyebilirsiniz.</p> + <p data-msgid="__MSG_possible__">Artık Snowflake logosunu istediğiniz web sitesine ekleyebilirsiniz.</p> - <textarea readonly><iframe src="https://snowflake.torproject.org/embed.html" width="320px" height="200px" frameborder="0" scrolling="no"></iframe></textarea><p>Şu şekilde görüntülenir:</p> + <textarea readonly><iframe src="https://snowflake.torproject.org/embed.html" width="320px" height="200px" frameborder="0" scrolling="no"></iframe></textarea><p data-msgid="__MSG_looksLike__">Şu şekilde görüntülenir:</p> - <iframe src="embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe> - </section></section> + <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe> + </section></section> +</div> + <script src="index.js"></script> </body> </html> [View Less]

1 0

[translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
by translation＠torproject.org 17 Oct '19

17 Oct '19

commit 0962e4292b5dac082613b5155f31bd73f3b52316 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 06:17:30 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-i… --- tr/index.html | 79 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/tr/index.html b/tr/index.html index 66b3aa2a8..9f40b07ec 100644 --- a/tr/index.html +++ b/tr/index.html @@ -1,74 +… [View More]1,83 @@ <!doctype html> -<html lang="tr"> +<html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Snowflake</title> -<link rel="icon" href="assets/favicon.ico"> -<link rel="stylesheet" href="index.css"> +<link rel="icon" href="./assets/favicon.ico"> +<link rel="stylesheet" href="./bootstrap.css"> +<link rel="stylesheet" href="./index.css"> </head> -<body> - <header id="header"><a href="https://www.torproject.org/"> - <img src="tor-logo(a)2x.png" alt="Tor" height="50"></a></header><section id="content"><h1>SNOWFLAKE</h1> +<body class="no-gutters"> + <header id="header"><nav class="navbar no-background navbar-dark bg-dark p-4"><a class="navbar-brand" href="https://www.torproject.org/"> + <img src="./tor-logo(a)2x.png" alt="Tor" height="50"></a><div class="btn-group dropdown pull-right"> +<button id="language-switcher" type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + </button><div id="supported-languages" class="dropdown-menu"> + </div> + </div> + </nav></header><div> + <section id="content"><h1>SNOWFLAKE</h1> - <p class="diagram"><img src="https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/…" alt="Diagram"></p> + <p class="diagram"><img src="https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/…" alt="Diagram"></p> - <p>Snowflake İnternet sansürünü aşmaya yönelik bir sistemdir. Sansüre uğrayan - kişiler, Snowflake kullanarak İnternete erişebilir. Bağlantı, gönüllüler tarafından - işletilen Snowflake vekil sunucuları üzerinden kurulur. Snowflake hakkında - information about how Snowflake works see our - <a href="https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/">viki</a> sayfamıza bakabilirsiniz.</p> + <p data-msgid="__MSG_websiteIntro__">Snowflake İnternet sansürünü aşmaya yönelik bir sistemdir. + Sansüre uğrayan kişiler, Snowflake kullanarak İnternete erişebilir. + Bağlantı, gönüllüler tarafından işletilen Snowflake vekil sunucuları ile sağlanır. + Snowflake hakkında ayrıntılı bilgi almak için + <a href="https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/" data-msgid="__MSG_docWiki__">Viki</a> sayfamıza bakabilirsiniz.</p> - <div class="sidebyside"> + <div class="sidebyside"> - <section id="browser" class="browser"><h2>Tarayıcı</h2> + <section id="browser" class="browser"><h2 data-msgid="__MSG_browser__">Tarayıcı</h2> - <p>İnternet erişiminiz sansürleniyorsa + <p data-msgid="__MSG_censoredUsers__">İnternet erişiminiz sansürleniyorsa <a href="https://www.torproject.org/download/">Tor Browser</a> uygulamasını indirmelisiniz.</p> - <p class="screenshot"><img src="screenshot.png" alt="Tor Browser screenshot"></p> - </section><section id="extension" class="extension"><h2>Eklenti</h2> + <p class="screenshot"><img src="./screenshot.png" alt="Tor Browser ekran görüntüsü"></p> + </section><section id="extension" class="extension"><h2 data-msgid="__MSG_extension__">Eklenti</h2> - <p>İnternet erişiminiz <strong>sansürlenmiyorsa</strong>, sansürlenen ağlardaki + <p data-msgid="__MSG_installExtension__">İnternet erişiminiz <strong>sansürlenmiyorsa</strong>, sansürlenen ağlardaki kullanıcılara yardımcı olmak için Snowflake eklentisini kurabilirsiniz. Diğer kullanıcıların vekil sunucunuz üzerinden eriştiği sayfalar hakkında endişelenmeniz gerekmez. Bu kullanıcıların görülebilecek IP adresleri sizin değil Tor çıkış durağının adresi olur.</p> - <p class="addon"><a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/"> - <img src="firefox150.jpg" alt="Install in Firefox" height="100"><br><span>Firefox üzerine kur</span> + <p class="addon"><a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/"> + <img src="./firefox150.jpg" alt="Firefox üzerine kurulum" height="100"><br><span data-msgid="MSG_installFirefox__">Firefox üzerine kurulum</span> </a> <a href="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmma…"> - <img src="chrome150.jpg" alt="Install in Chrome" height="100"><br><span>Chrome üzerine kur</span> + <img src="./chrome150.jpg" alt="Chrome üzerine kurulum" height="100"><br><span data-msgid="__MSG_installChrome__">Chrome üzerine kurulum</span> </a></p> - </section> + </section> </div> - <section id="bugs"><h2>HATA BİLDİRİMİ</h2> + <section id="bugs"><h2 data-msgid="__MSG_reportingBugs__">Hata Bildirimi</h2> - <p>Bir istemci ya da vekil sunucu olarak Snowflake kullanırken sorun - yaşarsanız, hata bildirimi gönderebilirsiniz. Bunun için,</p> + <p data-msgid="__MSG_fileBug__">Bir istemci ya da vekil sunucu olarak Snowflake kullanırken sorun + yaşarsanız, hata bildiriminde bulunmanız iyi olur. Bunun için,</p> - <ol> -<li> <a href="https://trac.torproject.org/projects/tor/register">bir hesap + <ol> +<li data-msgid="__MSG_sharedAccount__"> <a href="https://trac.torproject.org/projects/tor/register">bir hesap açabilir</a> ya da <a href="https://trac.torproject.org/projects/tor/login">oturum açmak</a> için paylaşılan <b>cypherpunks</b> hesabı ve <b>writecode</b> parolasını kullanabilirsiniz.</li> - <li> + <li data-msgid="__MSG_bugTracker__"> <a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">Kayıt açmak için</a> hata izleyicimizi kullanabilirsiniz.</li> - </ol> -<p>Lütfen bildirim kaydında olabildiğince açıklayıcı olun ve yapabiliyorsanız + </ol> +<p data-msgid="__MSG_descriptive__">Lütfen bildirim kaydında olabildiğince açıklayıcı olun ve yapabiliyorsanız hatayı yeniden oluşturmamıza yardımcı olabilecek günlük iletilerini ekleyin. Sorunun Snowflake sisteminin hangi parçasında yaşandığını bildirmek için <em>snowflake-webextension</em> ya da <em>snowflake-client</em> anahtar sözcüklerini ekleyebilirsiniz.</p> - </section><section id="embed"><h2>YERLEŞTİRME</h2> + </section><section id="embed"><h2 data-msgid="__MSG_embed__">Ekleme</h2> - <p>Artık Snowflake amblemini herhangi bir web sitesine ekleyebilirsiniz.</p> + <p data-msgid="__MSG_possible__">Artık Snowflake logosunu istediğiniz web sitesine ekleyebilirsiniz.</p> - <textarea readonly><iframe src="https://snowflake.torproject.org/embed.html" width="320px" height="200px" frameborder="0" scrolling="no"></iframe></textarea><p>Şu şekilde görüntülenir:</p> + <textarea readonly><iframe src="https://snowflake.torproject.org/embed.html" width="320px" height="200px" frameborder="0" scrolling="no"></iframe></textarea><p data-msgid="__MSG_looksLike__">Şu şekilde görüntülenir:</p> - <iframe src="embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe> - </section></section> + <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe> + </section></section> +</div> + <script src="index.js"></script> </body> </html> [View Less]

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 17 Oct '19

17 Oct '19

commit 30bb148c53de3d1524d78ff672955695b6abd38d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 06:17:20 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- ca/messages.json | 14 +++++++------- de/messages.json | 4 ++-- mk/messages.json | 14 +++++++------- tr/messages.json | 12 ++++++------ zh_CN/messages.json | 14 +++++++------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/… [View More]

1 0

[tor/release-0.2.9] Travis: Remove a redundant clang Linux job
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 4e4297830ec04da32dda1b9424847f4710cc202e Author: teor <teor(a)torproject.org> Date: Thu Sep 26 17:39:46 2019 +1000 Travis: Remove a redundant clang Linux job Part of 31859. --- .travis.yml | 2 -- changes/ticket31859 | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b18335d74..f47fe8bb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,6 @@ env: matrix: ## include creates builds with gcc, linux,… [View More]

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'tor-github/pr/1369' into maint-0.2.9
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit c660f479608aa6be68929bb6f4cbeee87c5521cc Merge: 90de776ea 1e0e23c1e Author: teor <teor(a)torproject.org> Date: Thu Oct 17 14:49:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1369' into maint-0.2.9 .travis.yml | 58 ++++++++++++++++++++++------------------------------- changes/ticket30860 | 3 +++ changes/ticket31859 | 3 +++ 3 files changed, 30 insertions(+), 34 deletions(-)

1 0

[tor/release-0.2.9] Travis: Unroll the build matrix into matrix: include:
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 8520071f2313ae6973082ca7cb5680a9df88ce78 Author: teor <teor(a)torproject.org> Date: Thu Sep 26 17:25:17 2019 +1000 Travis: Unroll the build matrix into matrix: include: The jobs should be the same, but Travis may display them differently. Part of 31859. --- .travis.yml | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2bc6395d..b18335d74 100644 --- a/.travis.yml +++ b/.… [View More]travis.yml @@ -5,14 +5,12 @@ cache: compiler: - gcc - - clang os: - linux - - osx -## The build matrix in the following stanza expands into builds for each -## OS and compiler. +## We don't use the build matrix cross-product, because it makes too many jobs +## Instead, we list each job under matrix: include: env: global: ## The Travis CI environment allows us two cores, so let's use both. @@ -23,15 +21,17 @@ env: ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" matrix: - ## We want to use each build option at least once - ## - ## We don't list default variable values, because we set the defaults - ## in global (or the default is unset) + ## This matrix entry is required, but it doesn't actually create any jobs - matrix: - ## include creates builds with gcc, linux + ## include creates builds with gcc, linux, unless we override those defaults include: + ## gcc is the default compiler for most jobs, so we want a clang Linux job + - compiler: clang + ## clang is the default macOS compiler, so we use it for the macOS job + - compiler: clang + os: osx ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ## We only want to check these build option combinations once @@ -52,18 +52,11 @@ matrix: ## https://github.com/travis-ci/travis-ci/issues/1696 # fast_finish: true - ## Careful! We use global envs, which makes it hard to exclude or - ## allow failures by env: + ## Careful! We use global envs, which makes it hard to allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… - exclude: - ## gcc on OSX is less useful, because the default compiler is clang. - - compiler: gcc - os: osx - ## gcc on Linux with no env is redundant, because all the custom builds use - ## gcc on Linux - - compiler: gcc - os: linux - env: + # allow_failures: + # - compiler: gcc + # os: linux ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty [View Less]

1 0

[tor/release-0.2.9] Travis: Add a macOS chutney job, but don't wait for it to finish
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 1e0e23c1e48ebc388f7a16a08a3f12e01db15bfa Author: teor <teor(a)torproject.org> Date: Thu Sep 26 17:44:41 2019 +1000 Travis: Add a macOS chutney job, but don't wait for it to finish Since Travis macOS has IPv6 support (and Travis Linux does not), chutney will now run its IPv6 networks as part of Travis CI. But since chutney is slow, don't wait for the macOS chutney to finish. (Travis have fixed the duplicate notification bug in fast_finish. So we … [View More]can use fast_finish and allow_failure to finish early. Unfortunately, allow_failure also means we ignore failures in macOS chutney.) Also make sure that we have: * a compile on each platform, with each compiler, * a check on each platform, and * a check on each compiler. Finally, sort builds: allow fail last, macOS first, slowest first. Closes ticket 30860. Closes ticket 31859 for 0.2.9. --- .travis.yml | 37 ++++++++++++++++++------------------- changes/ticket30860 | 3 +++ changes/ticket31859 | 2 +- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index f47fe8bb2..564c97dbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,34 +27,33 @@ env: matrix: ## include creates builds with gcc, linux, unless we override those defaults include: - ## clang is the default macOS compiler, so we use it for the macOS job + ## We run basic tests on macOS - compiler: clang os: osx - ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" - ## We only want to check these build option combinations once - ## (they shouldn't vary by compiler or OS) - ## We run coverage with hardening off, which seems like enough - # - env: HARDENING_OPTIONS="" + ## We run chutney on Linux, because it's faster than chutney on macOS + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" ## We check asciidoc with distcheck, to make sure we remove doc products + ## We use Linux clang, because there are no other Linux clang jobs - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" - # We also try running a hardened clang build with chutney on Linux. - - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" compiler: clang + ## We include a single coverage build with the best options for coverage + - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + ## We run chutney on macOS, because macOS Travis has IPv6 + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx - ## Uncomment to allow the build to report success (with non-required - ## sub-builds continuing to run) if all required sub-builds have - ## succeeded. This is somewhat buggy currently: it can cause - ## duplicate notifications and prematurely report success if a - ## single sub-build has succeeded. See - ## https://github.com/travis-ci/travis-ci/issues/1696 - # fast_finish: true + ## Allow the build to report success (with non-required sub-builds + ## continuing to run) if all required sub-builds have succeeded. + fast_finish: true ## Careful! We use global envs, which makes it hard to allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… - # allow_failures: - # - compiler: gcc - # os: linux + allow_failures: + ## macOS chutney is very slow, so we let the build finish before it's done + ## We'd like to fast finish, but still eventually show failures. + ## But Travis doesn't have that option. + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty diff --git a/changes/ticket30860 b/changes/ticket30860 new file mode 100644 index 000000000..b946f735c --- /dev/null +++ b/changes/ticket30860 @@ -0,0 +1,3 @@ + o Testing: + - Run the chutney IPv6 networks as part of Travis CI. + Closes ticket 30860. diff --git a/changes/ticket31859 b/changes/ticket31859 index 0eb8a42e9..dbc591e00 100644 --- a/changes/ticket31859 +++ b/changes/ticket31859 @@ -1,3 +1,3 @@ o Testing: - - Remove some redundant Travis CI jobs, to speed up CI. + - Simplify the Travis CI build matrix, and optimise for build time. Closes ticket 31859. [View Less]

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 73b18f1f12d1a43f6f0febc0ee6c15776bf11a1a Merge: f99a64eea c660f4796 Author: teor <teor(a)torproject.org> Date: Thu Oct 17 14:51:44 2019 +1000 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 58 ++++++++++++++++++++++------------------------------- changes/ticket30860 | 3 +++ changes/ticket31859 | 3 +++ 3 files changed, 30 insertions(+), 34 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'bug31859_029' into bug31859_035
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit f368f5bc370d23f2e1888faeeceecb1cea290242 Merge: 02840169d 1e0e23c1e Author: teor <teor(a)torproject.org> Date: Tue Oct 1 17:20:16 2019 +1000 Merge branch 'bug31859_029' into bug31859_035 While merging: * leave out some redundant jobs and build matrix entries .travis.yml | 68 ++++++++++++++++++----------------------------------- changes/ticket30860 | 3 +++ changes/ticket31859 | 3 +++ 3 files changed, 29 insertions(+), 45 deletions(-) diff --cc .… [View More]travis.yml index ef2e41998,564c97dbf..1f555c69c --- a/.travis.yml +++ b/.travis.yml @@@ -30,69 -21,40 +28,49 @@@ env ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" matrix: - ## We want to use each build option at least once - ## - ## We don't list default variable values, because we set the defaults - ## in global (or the default is unset) + ## This matrix entry is required, but it doesn't actually create any jobs - - ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true matrix: - ## include creates builds with gcc, linux + ## include creates builds with gcc, linux, unless we override those defaults include: - ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" - ## We only want to check these build option combinations once - ## (they shouldn't vary by compiler or OS) - ## We run rust and coverage with hardening off, which seems like enough - # - env: HARDENING_OPTIONS="" + ## We run basic tests on macOS + - compiler: clang + os: osx + ## We run chutney on Linux, because it's faster than chutney on macOS + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" ## We check asciidoc with distcheck, to make sure we remove doc products - ## We use Linux clang, because there are no other Linux clang jobs - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" - # We also try running a hardened clang build with chutney on Linux. - - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" -- compiler: clang + ## We include a single coverage build with the best options for coverage + - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + ## We run chutney on macOS, because macOS Travis has IPv6 + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx + # We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" + ## Check rust online with distcheck, to make sure we remove rust products + - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + ## Check disable module dirauth with and without rust + - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - env: MODULES_OPTIONS="--disable-module-dirauth" + ## Check NSS + - env: NSS_OPTIONS="--enable-nss" - ## Uncomment to allow the build to report success (with non-required - ## sub-builds continuing to run) if all required sub-builds have - ## succeeded. This is somewhat buggy currently: it can cause - ## duplicate notifications and prematurely report success if a - ## single sub-build has succeeded. See - ## https://github.com/travis-ci/travis-ci/issues/1696 - # fast_finish: true + ## Allow the build to report success (with non-required sub-builds + ## continuing to run) if all required sub-builds have succeeded. + fast_finish: true - ## Careful! We use global envs, which makes it hard to exclude or - ## allow failures by env: + ## Careful! We use global envs, which makes it hard to allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… allow_failures: + ## macOS chutney is very slow, so we let the build finish before it's done + ## We'd like to fast finish, but still eventually show failures. + ## But Travis doesn't have that option. + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx + ## test-stem sometimes hangs on Travis + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" - exclude: - ## gcc on OSX is less useful, because the default compiler is clang. - - compiler: gcc - os: osx - ## gcc on Linux with no env is redundant, because all the custom builds use - ## gcc on Linux - - compiler: gcc - os: linux - env: - ## offline rust builds for gcc on Linux are redundant, because we do an - ## online rust build for gcc on Linux - - compiler: gcc - os: linux - ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty [View Less]

1 0

[tor/release-0.3.5] Travis: Split jobs, add essential jobs, remove redundant jobs
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 4482d6fde5b0b8a0261dd31889a23b789844a486 Author: teor <teor(a)torproject.org> Date: Tue Oct 1 17:28:26 2019 +1000 Travis: Split jobs, add essential jobs, remove redundant jobs Part of 31859 for 0.3.5. --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f555c69c..670b0536f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,14 +46,15 @@ matrix: ## We run chutney on macOS, because macOS … [View More]

1 0