[tor-commits] [tor/maint-0.4.2] Merge branch 'bug32240_029' into bug32240_035

[teor@xxxxxxxxxxxxxx]

commit 75096de4c7ade9d8e734017d46714378bf3ae94c
Merge: 1cd20ff84 37b04aeed
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Mon Dec 16 09:09:16 2019 +1000

    Merge branch 'bug32240_029' into bug32240_035
    
    Merge
    * Chutney Trusty deletion in bug32240_029
    * NSS addition in maint-0.3.5

 .travis.yml         | 7 +++----
 changes/ticket32240 | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --cc .travis.yml
index 98bb8cce8,a67b8b92f..6ed69f5fb
--- a/.travis.yml
+++ b/.travis.yml
@@@ -41,18 -37,10 +44,14 @@@ matrix
        os: osx
        ## Turn off some newer features, turn on clang's -Wtypedef-redefinition
        env: C_DIALECT_OPTIONS="-std=gnu99"
 -    ## We run chutney on Linux, because it's faster than chutney on macOS
 +    ## We check NSS
      ## 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"
 +    - env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99"
 +    ## We run chutney on Linux, because it's faster than chutney on macOS
 +    ## 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"



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits