diff options
| author | teor <teor@torproject.org> | 2019-10-22 19:37:32 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-22 19:42:23 +1000 |
| commit | 92ad87b8082423af2b9873c921eebce5cc5fe296 (patch) | |
| tree | 61c40cd559acdbaa158dce21909caae20a49023e | |
| parent | 4b8e5ea0dce85bb96ce92f171246aa101feda4ac (diff) | |
| parent | 511aeba8eeb24a953228e00917f64703059a7673 (diff) | |
| download | tor-92ad87b8082423af2b9873c921eebce5cc5fe296.tar.gz tor-92ad87b8082423af2b9873c921eebce5cc5fe296.zip | |
Merge branch 'ticket32177_029' into ticket32177_035
Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029.
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | changes/ticket32177 | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 65088d556d..147ca41dff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,8 +57,9 @@ matrix: 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 new file mode 100644 index 0000000000..6d6816acde --- /dev/null +++ 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. |