commit 92ad87b8082423af2b9873c921eebce5cc5fe296 Merge: 4b8e5ea0d 511aeba8e Author: teor teor@torproject.org Date: Tue Oct 22 19:37:32 2019 +1000

Merge branch 'ticket32177_029' into ticket32177_035

Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029.

.travis.yml | 5 +++-- changes/ticket32177 | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-)

diff --cc .travis.yml index 65088d556,7c7fcf4f6..147ca41df --- a/.travis.yml +++ b/.travis.yml @@@ -37,30 -30,18 +37,31 @@@ 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" + ## 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 - ## We use Linux clang, because there are no other Linux clang jobs - 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 + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" compiler: clang - ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + os: osx ## We run chutney on macOS, because macOS Travis has IPv6 - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx + # Disabled due to slow Travis macOS builds, see #32177 + #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + # os: osx + ## We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"

## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded.