nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug32240_029' into bug32240_035

Browse Source 
Merge
* Chutney Trusty deletion in bug32240_029
* NSS addition in maint-0.3.5
This commit is contained in:
teor 2019-12-16 09:09:16 +10:00
commit 75096de4c7
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -29,6 +29,9 @@ env:
- HARDENING_OPTIONS="--enable-expensive-hardening" - HARDENING_OPTIONS="--enable-expensive-hardening"
## We turn off asciidoc by default, because it's slow ## We turn off asciidoc by default, because it's slow
- ASCIIDOC_OPTIONS="--disable-asciidoc" - 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: matrix:
## This matrix entry is required, but it doesn't actually create any jobs ## 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 ## 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" - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
compiler: clang 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 check asciidoc with distcheck, to make sure we remove doc products
## We use Linux clang, because there are no other Linux clang jobs ## We use Linux clang, because there are no other Linux clang jobs
- env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"

4
changes/ticket32240 Normal file
View 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.