diff options
| author | teor <teor@torproject.org> | 2019-12-16 09:15:42 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 09:15:42 +1000 |
| commit | da404910a7cb25c20baf3fbf5e7a6a056bdbe9df (patch) | |
| tree | 534b26250ccb4fc36002e08241b35ddfbe857beb /.travis.yml | |
| parent | bd11fb10962f5b6e7d51ff5a0e6263ad39d4d184 (diff) | |
| parent | 4a34fd5b746fcbd712607323cb48cfcd6e72456f (diff) | |
| download | tor-da404910a7cb25c20baf3fbf5e7a6a056bdbe9df.tar.gz tor-da404910a7cb25c20baf3fbf5e7a6a056bdbe9df.zip | |
Merge branch 'bug32240_041' into bug32240_042
Merge:
* CHUTNEY_TOR_SANDBOX=0 from bug32240_041
* RUST_VERSION from maint-0.4.2
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 80c8611a41..aee59ed268 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" |