diff options
| author | teor <teor@torproject.org> | 2019-12-16 09:17:02 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 09:17:02 +1000 |
| commit | 86ca3194aac91d8558a0269e3ef341b07c2b1602 (patch) | |
| tree | a8f7b65400ee92bc9618e1567efdfb656a6c5a92 /.travis.yml | |
| parent | 5082eeba38b36fbd87fea821a1f29a85b5cdd994 (diff) | |
| parent | da404910a7cb25c20baf3fbf5e7a6a056bdbe9df (diff) | |
| download | tor-86ca3194aac91d8558a0269e3ef341b07c2b1602.tar.gz tor-86ca3194aac91d8558a0269e3ef341b07c2b1602.zip | |
Merge branch 'bug32240_042' into bug32240_master
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 1fee931e24..f007838a90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,9 @@ env: - ASCIIDOC_OPTIONS="--disable-asciidoc" ## Our default rust version is the minimum supported version - RUST_VERSION="1.31.0" + ## 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 - @@ -51,10 +54,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" |