]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Revert "Travis: Disable all but one macOS build"
authorteor <teor@torproject.org>
Thu, 28 Nov 2019 02:10:10 +0000 (12:10 +1000)
committerteor <teor@torproject.org>
Thu, 28 Nov 2019 02:10:10 +0000 (12:10 +1000)
This reverts commit 511aeba8eeb24a953228e00917f64703059a7673.

.travis.yml
changes/ticket32177 [deleted file]

index 4ea9400b88937888e8a05b698a764601ac1cf4fd..aad0c3c3e138a569c6edf3c47dcbb5efa086cefb 100644 (file)
@@ -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 (file)
index 6d6816a..0000000
+++ /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.