summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-10-22 19:43:33 +1000
committerteor <teor@torproject.org>2019-10-22 19:43:33 +1000
commit868bcc24e512f20492ff21e9267d92e8b9e20128 (patch)
tree224115eeaf6f1ec4a9b9cac26493b4a09e406574 /.travis.yml
parent89ead08eefbb2ab4201bc8286afcf99b1286bafc (diff)
parent8e0190d837ec5b083595a5b002c69986e5bbe9d2 (diff)
downloadtor-868bcc24e512f20492ff21e9267d92e8b9e20128.tar.gz
tor-868bcc24e512f20492ff21e9267d92e8b9e20128.zip
Merge branch 'ticket32177_035' into ticket32177_040
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml12
1 files changed, 7 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index b3b8cb977d..c48294f360 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,12 +53,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_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"
+ # 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"