Skip to content

Commit

Permalink
Merge branch 'maint-0.2.9' into release-0.2.9
Browse files Browse the repository at this point in the history
  • Loading branch information
teor2345 committed Dec 20, 2019
2 parents 95caab8 + 37b04ae commit 38cc3a4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Expand Up @@ -22,6 +22,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
-
Expand All @@ -38,10 +41,6 @@ matrix:
## Use -std=gnu99 to turn off some newer features, and maybe turn on some
## extra gcc warnings?
- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99"
## (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"
Expand Down
4 changes: 4 additions & 0 deletions 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.

0 comments on commit 38cc3a4

Please sign in to comment.