From: teor <teor@torproject.org>
Date: Sun, 1 Dec 2019 10:28:44 +0000 (+1000)
Subject: Merge branch 'ticket32629_041' into ticket32629_042
X-Git-Tag: tor-0.4.2.6~13^2~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a157c7569c6ad5e37747852a823369b48229ef7;p=thirdparty%2Ftor.git

Merge branch 'ticket32629_041' into ticket32629_042

Merge RUST_VERSION from maint-0.4.2 with disabling the macOS Rust
job from ticket32629_041.
---

4a157c7569c6ad5e37747852a823369b48229ef7
diff --cc .travis.yml
index 252da6877a,c56ced37b0..f386500b21
--- 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