diff options
| author | teor <teor@torproject.org> | 2019-10-22 19:44:58 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-22 19:44:58 +1000 |
| commit | 8f84999f581d8dc51d4636f4b02aea2748448802 (patch) | |
| tree | c2af2e1f591aa73b3a1fc1af6238e28801de4f8b | |
| parent | 7a35c8d8bec8243820149b4560429c3b91c35f74 (diff) | |
| parent | 86b1714731f0e2679be4ab1a8aa7cb62730ba4bb (diff) | |
| download | tor-8f84999f581d8dc51d4636f4b02aea2748448802.tar.gz tor-8f84999f581d8dc51d4636f4b02aea2748448802.zip | |
Merge branch 'ticket32177_041' into ticket32177_042
Merge RUST_VERSION from maint-0.4.2 into disabled macOS rust build
from ticket32177_041.
| -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 c65923d2c4..f9f13c8569 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,12 +57,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_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - compiler: clang - os: osx + # Disabled due to slow Travis macOS builds, see #32177 + #- env: RUST_VERSION="nightly" 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. |