tor

commit b3478a8856cc54158fdfe0f19818e6552883d161
parent b4e1dc747e996c5e0ee56930fec09d090eace032
Author: teor <teor@torproject.org>
Date:   Tue, 22 Oct 2019 20:48:26 +1000

Merge branch 'maint-0.4.2'

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

2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -59,12 +59,14 @@ matrix:
     ## 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_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
-      compiler: clang
-      os: osx
+    # Disabled due to slow Travis macOS builds, see #32177
+    #- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
+    #  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.