commit 7e17c24381495f6eaf648b56e5239a7954fbd4ef
parent cd160291a755ac830855e3226e6c470a5b2ecede
Author: teor <teor@torproject.org>
Date: Fri, 20 Dec 2019 10:12:18 +1000
Merge remote-tracking branch 'tor-github/pr/1606'
Diffstat:
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git 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"
@@ -120,8 +119,7 @@ addons:
- libnss3-dev
- libscrypt-dev
- libseccomp-dev
- ## zstd doesn't exist in Ubuntu Trusty
- #- libzstd
+ - libzstd-dev
## Optional build dependencies
- coccinelle
- shellcheck
diff --git a/changes/ticket32240 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
@@ -0,0 +1,2 @@
+ o Testing (continuous integration):
+ - Use zstd in our Travis Linux builds. Closes ticket 32242.
