Unverified Commit 7dd59460 authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9

parents b7b467d3 b84e7715
......@@ -49,9 +49,8 @@ matrix:
## We include a single coverage build with the best options for coverage
- env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
## 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"
# os: osx
- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
os: osx
## Allow the build to report success (with non-required sub-builds
## continuing to run) if all required sub-builds have succeeded.
......
o Testing:
- Disable all but one Travis CI macOS build, to mitigate slow scheduling
of Travis macOS jobs. Closes ticket 32177.
o Testing:
- Re-enable the Travis CI macOS Chutney build, but allow the job to finish
before it finishes, because the Travis macOS jobs are slow.
Closes ticket 32629.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment