mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 04:13:28 +01:00
Merge branch 'maint-0.4.0' into maint-0.4.1
This commit is contained in:
commit
7237637871
10
.travis.yml
10
.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
|
||||
- shellcheck
|
||||
## Conditional build dependencies
|
||||
## Always installed, so we don't need sudo
|
||||
|
4
changes/ticket32240
Normal file
4
changes/ticket32240
Normal file
@ -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.
|
2
changes/ticket32242
Normal file
2
changes/ticket32242
Normal file
@ -0,0 +1,2 @@
|
||||
o Testing (continuous integration):
|
||||
- Use zstd in our Travis Linux builds. Closes ticket 32242.
|
Loading…
Reference in New Issue
Block a user