diff options
| author | teor <teor@torproject.org> | 2019-12-16 08:16:28 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 08:16:28 +1000 |
| commit | 5082eeba38b36fbd87fea821a1f29a85b5cdd994 (patch) | |
| tree | 6f798c21375b056f9e6e81f1b49d4eff6abad53c /.travis.yml | |
| parent | 648399d6c256d4a8870758e1fb85310a018403f9 (diff) | |
| parent | bd11fb10962f5b6e7d51ff5a0e6263ad39d4d184 (diff) | |
| download | tor-5082eeba38b36fbd87fea821a1f29a85b5cdd994.tar.gz tor-5082eeba38b36fbd87fea821a1f29a85b5cdd994.zip | |
Merge branch '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 eabc495aa4..1fee931e24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,15 +70,16 @@ matrix: - env: MODULES_OPTIONS="--disable-module-relay" ## 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" |