[tor-commits] [tor/release-0.4.2] Revert "Travis: Disable all but one macOS build"

[teor at torproject.org]

commit 99b5f1b261a3b8535e8e9b8ca8ca23303c2aea2d
Author: teor <teor at torproject.org>
Date:   Thu Nov 28 12:10:10 2019 +1000

    Revert "Travis: Disable all but one macOS build"
    
    This reverts commit 511aeba8eeb24a953228e00917f64703059a7673.
---
 .travis.yml         | 5 ++---
 changes/ticket32177 | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4ea9400b8..aad0c3c3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,9 +45,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.
diff --git a/changes/ticket32177 b/changes/ticket32177
deleted file mode 100644
index 6d6816acd..000000000
--- a/changes/ticket32177
+++ /dev/null
@@ -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.