diff options
| author | teor <teor@torproject.org> | 2019-10-22 20:46:08 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-22 20:46:08 +1000 |
| commit | 14ba43f92edf54343c7358d7c32f5f0993c9a5ae (patch) | |
| tree | 70735b7df083bd5eb5e5bef17f2d7cbeaa1402dd | |
| parent | 73b18f1f12d1a43f6f0febc0ee6c15776bf11a1a (diff) | |
| parent | 511aeba8eeb24a953228e00917f64703059a7673 (diff) | |
| download | tor-14ba43f92edf54343c7358d7c32f5f0993c9a5ae.tar.gz tor-14ba43f92edf54343c7358d7c32f5f0993c9a5ae.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | changes/ticket32177 | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 564c97dbfd..7c7fcf4f6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,9 @@ 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 - - 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 ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. diff --git a/changes/ticket32177 b/changes/ticket32177 new file mode 100644 index 0000000000..6d6816acde --- /dev/null +++ b/changes/ticket32177 @@ -0,0 +1,3 @@ + o Testing: + - Disable all but one Travis CI macOS build, to mitigate slow scheduling + of Travis macOS jobs. Closes ticket 32177. |