summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-10-01 17:28:26 +1000
committerteor <teor@torproject.org>2019-10-01 17:32:09 +1000
commit4482d6fde5b0b8a0261dd31889a23b789844a486 (patch)
tree9e265868b05e824dc82e7cf2abf471163fdfb80c /.travis.yml
parentf368f5bc370d23f2e1888faeeceecb1cea290242 (diff)
downloadtor-4482d6fde5b0b8a0261dd31889a23b789844a486.tar.gz
tor-4482d6fde5b0b8a0261dd31889a23b789844a486.zip
Travis: Split jobs, add essential jobs, remove redundant jobs
Part of 31859 for 0.3.5.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml13
1 files changed, 7 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 1f555c69cd..670b0536fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,14 +46,15 @@ matrix:
## We run chutney on macOS, because macOS Travis has IPv6
- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
os: osx
- # We clone our stem repo and run `make test-stem`
+ ## We clone our stem repo and run `make test-stem`
- env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"
- ## Check rust online with distcheck, to make sure we remove rust products
- - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
- ## Check disable module dirauth with and without rust
- - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
+ ## We check disable module dirauth
- env: MODULES_OPTIONS="--disable-module-dirauth"
- ## Check NSS
+ ## 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
+ ## We check NSS
- env: NSS_OPTIONS="--enable-nss"
## Allow the build to report success (with non-required sub-builds