diff options
| author | teor <teor@torproject.org> | 2019-12-16 09:14:38 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 09:14:38 +1000 |
| commit | 4a34fd5b746fcbd712607323cb48cfcd6e72456f (patch) | |
| tree | 1f101a9cb7e5247269320c006b3d8a1c6c2694fb /.travis.yml | |
| parent | ffccf6fc55f691e01ccd3e756486415cbc7ffe8a (diff) | |
| parent | e2f78396f400dff5b28f6fdf845a9bcf7a8d1b85 (diff) | |
| download | tor-4a34fd5b746fcbd712607323cb48cfcd6e72456f.tar.gz tor-4a34fd5b746fcbd712607323cb48cfcd6e72456f.zip | |
Merge branch 'bug32240_040' into bug32240_041
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 6b064d0c34..8d68629ea6 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" |