tor

commit ffccf6fc55f691e01ccd3e756486415cbc7ffe8a
parent 7174a80edd13d53f63be1558c6de341ec1296006
Author: teor <teor@torproject.org>
Date:   Mon, 16 Dec 2019 08:16:12 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

Diffstat:
M
.travis.yml
 | 
9
+++++----
D
changes/ticket32177
 | 
3
---
A
changes/ticket32629
 | 
4
++++

3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -66,15 +66,16 @@ matrix:
     - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
     ## We check disable module dirauth
     - env: MODULES_OPTIONS="--disable-module-dirauth"
+    ## macOS builds are very slow, and we have a limited number of
+    ## concurrent macOS jobs. We're not actively developing Rust, so it is
+    ## the lowest priority.
     ## We run rust on macOS, because we have seen macOS rust failures before
-    # Disabled due to slow Travis macOS builds, see #32177
     #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
     #  compiler: clang
     #  os: osx
     ## 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
     ## 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
@@ -1,3 +0,0 @@
-  o Testing:
-    - Disable all but one Travis CI macOS build, to mitigate slow scheduling
-      of Travis macOS jobs. Closes ticket 32177.
diff --git a/changes/ticket32629 b/changes/ticket32629
@@ -0,0 +1,4 @@
+  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.