diff options
author | teor <teor@torproject.org> | 2019-10-22 19:43:38 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-10-22 19:43:38 +1000 |
commit | 86b1714731f0e2679be4ab1a8aa7cb62730ba4bb (patch) | |
tree | e9f34d83168111b168a5d88676fa8f6576030063 /.travis.yml | |
parent | 53aa159632ea5138614e974a2709c378dfe53cde (diff) | |
parent | 868bcc24e512f20492ff21e9267d92e8b9e20128 (diff) | |
download | tor-86b1714731f0e2679be4ab1a8aa7cb62730ba4bb.tar.gz tor-86b1714731f0e2679be4ab1a8aa7cb62730ba4bb.zip |
Merge branch 'ticket32177_040' into ticket32177_041
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 909a3d28da..221fab71c6 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" |