[tor-commits] [tor/release-0.4.0] Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035

[teor at torproject.org]

commit 1eb57b20b943caa4ee0a5aaefcd8c732eee950b3
Merge: d175e7081 8e549dd56
Author: teor <teor at torproject.org>
Date:   Fri Oct 25 09:48:14 2019 +1000

    Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035

 .travis.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --cc .travis.yml
index 8f7e8e4be,1bb401690..4ded5e25a
--- a/.travis.yml
+++ b/.travis.yml
@@@ -39,26 -32,18 +39,34 @@@ matrix
      ## We run basic tests on macOS
      - compiler: clang
        os: osx
 +    ## We check NSS
 +    ## NSS is a fast job, clang is slower on Linux, so we do NSS clang
 +    - env: NSS_OPTIONS="--enable-nss"
 +      compiler: clang
      ## We run chutney on Linux, because it's faster than chutney on macOS
      - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
+       ## (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"
+       compiler: clang
      ## We include a single coverage build with the best options for coverage
      - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
 +    ## We run rust on Linux, because it's faster than rust on macOS
 +    ## We check rust offline
 +    - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
 +    ## We check asciidoc with distcheck, to make sure we remove doc products
 +    - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
 +    ## We check disable module dirauth
 +    - env: MODULES_OPTIONS="--disable-module-dirauth"
 +    ## We run rust on macOS, because we have seen macOS rust failures before
 +    # Disabled due to slow Travis macOS builds, see #32177
 +    #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
 +    #  compiler: clang
 +    #  os: osx
      ## We run chutney on macOS, because macOS Travis has IPv6
      # Disabled due to slow Travis macOS builds, see #32177
      #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
@@@ -73,19 -56,14 +81,19 @@@
    ## Careful! We use global envs, which makes it hard to allow failures by env:
    ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-allow_failures
    allow_failures:
 -    ## macOS chutney is very slow, so we let the build finish before it's done
 -    ## We'd like to fast finish, but still eventually show failures.
 -    ## But Travis doesn't have that option.
 +    ## macOS rust and chutney are very slow, so we let the build finish before
 +    ## they are done.  We'd like to fast finish, but still eventually show
 +    ## any failures in the build status. But Travis doesn't have that ability.
 +    - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
 +      compiler: clang
 +      os: osx
      - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
        os: osx
 +    ## test-stem sometimes hangs on Travis
 +    - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"
  
- ## (Linux only) Use the latest Linux image (Ubuntu Trusty)
- dist: trusty
+ ## (Linux only) Use a recent Linux image (Ubuntu Bionic)
+ dist: bionic
  
  ## Download our dependencies
  addons: