commit 4a157c7569c6ad5e37747852a823369b48229ef7 Merge: eb8170408 a00b9e5a8 Author: teor teor@torproject.org Date: Sun Dec 1 20:28:44 2019 +1000
Merge branch 'ticket32629_041' into ticket32629_042
Merge RUST_VERSION from maint-0.4.2 with disabling the macOS Rust job from ticket32629_041.
.travis.yml | 9 +++++---- changes/ticket32177 | 3 --- 2 files changed, 5 insertions(+), 7 deletions(-)
diff --cc .travis.yml index 252da6877,c56ced37b..f386500b2 --- a/.travis.yml +++ b/.travis.yml @@@ -64,9 -62,11 +64,11 @@@ matrix - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" + ## macOS builds are very slow, and we have a limited number of + ## concurrent macOS jobs. We're not actively developing Rust, so it is + ## the lowest priority. ## We run rust on macOS, because we have seen macOS rust failures before - # 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