diff options
| author | teor <teor@torproject.org> | 2019-12-20 10:12:55 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-20 10:12:55 +1000 |
| commit | 664a2c0755156bce2947338bf08edc1f02326e1d (patch) | |
| tree | 74b758f47344e0bdd8b0c8bc9899032ab15e2539 | |
| parent | d5702a6340104434fe1d82a340c74b2393a1f8aa (diff) | |
| parent | 5dbb607e9472ee7fb42091ae7dc0c7f2550c4425 (diff) | |
| download | tor-664a2c0755156bce2947338bf08edc1f02326e1d.tar.gz tor-664a2c0755156bce2947338bf08edc1f02326e1d.zip | |
Merge branch 'maint-0.4.2' into release-0.4.2
| -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 80c8611a41..368910f1f1 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" @@ -118,8 +117,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. |