diff options
| author | teor <teor@torproject.org> | 2019-12-20 10:12:47 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-20 10:12:47 +1000 |
| commit | 69d7ea4db963155e6133bc724d4639ea1bd31d1c (patch) | |
| tree | 0f36ac7e197fe6e6ab1a28c6639ce1e0a1c38acd | |
| parent | 7c2e1f6ddd116eefc9f65f0536a5f3b1f5735966 (diff) | |
| parent | 72376378714fef727004830157da79be97821a60 (diff) | |
| download | tor-69d7ea4db963155e6133bc724d4639ea1bd31d1c.tar.gz tor-69d7ea4db963155e6133bc724d4639ea1bd31d1c.zip | |
Merge branch 'maint-0.4.1' into release-0.4.1
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | changes/ticket32240 | 4 | ||||
| -rw-r--r-- | changes/ticket32242 | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 6b064d0c34..375796799b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,9 @@ env: - HARDENING_OPTIONS="--enable-expensive-hardening" ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" + ## Turn off tor's sandbox in chutney, until we fix sandbox errors that are + ## triggered by Ubuntu Xenial and Bionic. See #32722. + - CHUTNEY_TOR_SANDBOX="0" matrix: ## This matrix entry is required, but it doesn't actually create any jobs - @@ -49,10 +52,6 @@ matrix: ## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" compiler: clang - ## (Linux only) Use an older Linux image (Ubuntu Trusty) - ## The Xenial and Bionic images cause permissions issues for chutney, - ## this is a workaround, until we fix #32240. - dist: trusty ## 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" @@ -116,8 +115,7 @@ addons: - libnss3-dev - libscrypt-dev - libseccomp-dev - ## zstd doesn't exist in Ubuntu Trusty - #- libzstd + - libzstd-dev - shellcheck ## Conditional build dependencies ## Always installed, so we don't need sudo diff --git a/changes/ticket32240 b/changes/ticket32240 new file mode 100644 index 0000000000..35cc3df27e --- /dev/null +++ b/changes/ticket32240 @@ -0,0 +1,4 @@ + o Testing: + - Turn off Tor's Sandbox in Chutney jobs, and run those jobs on Ubuntu + Bionic. Turning off the Sandbox is a work-around, until we fix the + sandbox errors in 32722. Closes ticket 32240. diff --git a/changes/ticket32242 b/changes/ticket32242 new file mode 100644 index 0000000000..d63d5a586e --- /dev/null +++ b/changes/ticket32242 @@ -0,0 +1,2 @@ + o Testing (continuous integration): + - Use zstd in our Travis Linux builds. Closes ticket 32242. |