summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-10-22 20:48:26 +1000
committerteor <teor@torproject.org>2019-10-22 20:48:26 +1000
commitb3478a8856cc54158fdfe0f19818e6552883d161 (patch)
treecf624df2fa0e7403c673616dd0072de0773fa424 /.travis.yml
parentb4e1dc747e996c5e0ee56930fec09d090eace032 (diff)
parentf98b59524c44843d992688562fde27cbbedc11f9 (diff)
downloadtor-b3478a8856cc54158fdfe0f19818e6552883d161.tar.gz
tor-b3478a8856cc54158fdfe0f19818e6552883d161.zip
Merge branch 'maint-0.4.2'
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 1d4f4bee18..a5f4be1f19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,12 +59,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_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"