summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-12-01 20:26:51 +1000
committerteor <teor@torproject.org>2019-12-01 20:26:51 +1000
commit349554f40d503a33f4b85c8481ca1434ac07acbf (patch)
tree653a540d176d7912dd87ed80860087354c5e7674 /.travis.yml
parent055f5d4d1b2c8ea5a85691f7110e82a9c468b6dd (diff)
parent6558bb4460f360ee16653d9430ee00e969f3adf7 (diff)
downloadtor-349554f40d503a33f4b85c8481ca1434ac07acbf.tar.gz
tor-349554f40d503a33f4b85c8481ca1434ac07acbf.zip
Merge branch 'ticket32629_035' into ticket32629_040
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 26cb8824a4..46685116fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,15 +62,16 @@ 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"
# compiler: clang
# os: osx
## We run chutney on macOS, because macOS Travis has IPv6
- # Disabled due to slow Travis macOS builds, see #32177
- #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
- # os: osx
+ - 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"