diff options
| author | teor <teor@torproject.org> | 2018-08-23 18:20:17 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-23 18:20:17 +1000 |
| commit | e8dd83aecb6faaca81e7c808010ae08c2ac574c9 (patch) | |
| tree | 7cbea284f757d9fec41da93e49fb2314b97b3217 /.travis.yml | |
| parent | 573b6e4f2f532b77341e5307e23f3c6bf6bdc725 (diff) | |
| parent | ae2085dd7be279b0fc3ff9c582d35a498c63350a (diff) | |
| download | tor-e8dd83aecb6faaca81e7c808010ae08c2ac574c9.tar.gz tor-e8dd83aecb6faaca81e7c808010ae08c2ac574c9.zip | |
Merge branch 'ticket27252-033' into ticket27252-034
Semantic merge:
- Rust offline and online were swapped in ticket27252-032
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 7db7577856..7cc8086b94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,8 @@ env: ## and it's going to take a while for them to be fixed. See: ## https:/trac.torproject.org/projects/tor/ticket/25386 ## https:/trac.torproject.org/projects/tor/ticket/26398 - - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" + ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 + - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" matrix: ## include creates builds with gcc, linux, sudo: false @@ -50,9 +51,9 @@ matrix: # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" - ## Check rust offline with distcheck, to make sure we remove rust products + ## Check rust online with distcheck, to make sure we remove rust products ## But without hardening (see above) - - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" ## Check disable module dirauth with rust, and without rust but with distcheck - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" - env: DISTCHECK="yes" MODULES_OPTIONS="--disable-module-dirauth" @@ -72,9 +73,23 @@ matrix: ## Clang doesn't work in containerized builds, see below. - compiler: clang sudo: false - ## We also exclude non-containerized gcc, because they're slow and redundant. + ## Non-containerized gcc are slow and redundant. - compiler: gcc sudo: required + ## gcc on OSX is less useful, because the default compiler is clang. + - compiler: gcc + os: osx + ## gcc on Linux with no env is redundant, because all the custom builds use + ## gcc on Linux + - compiler: gcc + os: linux + env: + ## offline rust builds for gcc on Linux are redundant, because we do an + ## online rust build for gcc on Linux + - compiler: gcc + os: linux + ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" ## We don't need sudo. (The "apt:" stanza after this allows us to not need ## sudo; otherwise, we would need it for getting dependencies.) |