diff options
| author | teor <teor@torproject.org> | 2019-10-22 20:48:05 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-22 20:48:05 +1000 |
| commit | 9bb0ca122f13255982566b440b0b9d03b6a9e44b (patch) | |
| tree | 224115eeaf6f1ec4a9b9cac26493b4a09e406574 | |
| parent | 89ead08eefbb2ab4201bc8286afcf99b1286bafc (diff) | |
| parent | bed439013394dc083c525d91129868071619c39b (diff) | |
| download | tor-9bb0ca122f13255982566b440b0b9d03b6a9e44b.tar.gz tor-9bb0ca122f13255982566b440b0b9d03b6a9e44b.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.0
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | changes/ticket32177 | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index b3b8cb977d..c48294f360 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,12 +53,14 @@ matrix: ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" ## We run rust on macOS, because we have seen macOS rust failures before - - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - compiler: clang - os: osx + # 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 - - 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. |