diff options
| author | teor <teor@torproject.org> | 2019-11-28 12:10:10 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-28 12:10:10 +1000 |
| commit | 99b5f1b261a3b8535e8e9b8ca8ca23303c2aea2d (patch) | |
| tree | 6f19452137b9609e97096e92ccf12d74def73e44 | |
| parent | 853b6ad0950e8014784109879fa058fb0cb90dc8 (diff) | |
| download | tor-99b5f1b261a3b8535e8e9b8ca8ca23303c2aea2d.tar.gz tor-99b5f1b261a3b8535e8e9b8ca8ca23303c2aea2d.zip | |
Revert "Travis: Disable all but one macOS build"
This reverts commit 511aeba8eeb24a953228e00917f64703059a7673.
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | changes/ticket32177 | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 4ea9400b88..aad0c3c3e1 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 6d6816acde..0000000000 --- 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. |