diff options
| author | teor <teor@torproject.org> | 2019-12-01 20:26:55 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-01 20:26:55 +1000 |
| commit | a00b9e5a86dd763e8d21958dc9022472f40a18d8 (patch) | |
| tree | f2e0c575732317fcba1c0bc5441af819e3f45298 /.travis.yml | |
| parent | 26071aa3be8f26d7e81384f1d40bb1d5fe94cca0 (diff) | |
| parent | 349554f40d503a33f4b85c8481ca1434ac07acbf (diff) | |
| download | tor-a00b9e5a86dd763e8d21958dc9022472f40a18d8.tar.gz tor-a00b9e5a86dd763e8d21958dc9022472f40a18d8.zip | |
Merge branch 'ticket32629_040' into ticket32629_041
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 237e5ed1ee..c56ced37b0 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" |