diff options
| author | teor <teor@torproject.org> | 2019-12-16 08:14:29 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 08:14:29 +1000 |
| commit | 933b0c1b1badc1f02ebf5ff29916e3b6987cd8c5 (patch) | |
| tree | 9c5b284d710d3f96f2bdcea07e1e155200b3d035 /.travis.yml | |
| parent | b7d18f861057fca75f8f49f16e31d9e3a8f94812 (diff) | |
| parent | f86d508d49dd36fede7091635044603741fdd353 (diff) | |
| download | tor-933b0c1b1badc1f02ebf5ff29916e3b6987cd8c5.tar.gz tor-933b0c1b1badc1f02ebf5ff29916e3b6987cd8c5.zip | |
Merge remote-tracking branch 'tor-github/pr/1577' into maint-0.4.2
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 94e5033d7a..80c8611a41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,15 +68,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_VERSION="nightly" 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" |