tor

commit 92ad87b8082423af2b9873c921eebce5cc5fe296
parent 4b8e5ea0dce85bb96ce92f171246aa101feda4ac
Author: teor <teor@torproject.org>
Date:   Tue, 22 Oct 2019 19:37:32 +1000

Merge branch 'ticket32177_029' into ticket32177_035

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

Diffstat:
M
.travis.yml
 | 
5
+++--
A
changes/ticket32177
 | 
3
+++

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -57,8 +57,9 @@ matrix:
       compiler: clang
       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"
 
diff --git a/changes/ticket32177 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.