diff options
author | teor <teor@torproject.org> | 2019-12-20 10:12:35 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-12-20 10:12:35 +1000 |
commit | 23e1c1c35c1778823498db29e6248e06082a925c (patch) | |
tree | f779453988b0a6cf15da67e924051861e7eee8b9 | |
parent | 28e708fcbc80d181367bc76553eb6a4325372bb7 (diff) | |
parent | 0b3763612cfd74fd8e1ee79f6fbe58a70e4288b8 (diff) | |
download | tor-23e1c1c35c1778823498db29e6248e06082a925c.tar.gz tor-23e1c1c35c1778823498db29e6248e06082a925c.zip |
Merge branch 'maint-0.3.5' into release-0.3.5
-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 98bb8cce80..7f7e7a5723 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" @@ -116,8 +115,7 @@ addons: - libnss3-dev - libscrypt-dev - libseccomp-dev - ## zstd doesn't exist in Ubuntu Trusty - #- libzstd + - libzstd-dev ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc 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. |