commit 8f84999f581d8dc51d4636f4b02aea2748448802 Merge: 7a35c8d8b 86b171473 Author: teor <teor@torproject.org> Date: Tue Oct 22 19:44:58 2019 +1000 Merge branch 'ticket32177_041' into ticket32177_042 Merge RUST_VERSION from maint-0.4.2 into disabled macOS rust build from ticket32177_041. .travis.yml | 12 +++++++----- changes/ticket32177 | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --cc .travis.yml index c65923d2c,221fab71c..f9f13c856 --- a/.travis.yml +++ b/.travis.yml @@@ -57,12 -53,14 +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_OPTIONS="--enable-rust --enable-cargo-online-mode" ++ #- 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"