diff options
| author | teor <teor@torproject.org> | 2018-08-23 18:18:50 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-23 18:19:42 +1000 |
| commit | ae2085dd7be279b0fc3ff9c582d35a498c63350a (patch) | |
| tree | f832757c985286e1fb09c2627faeb12e860651a5 /.travis.yml | |
| parent | 8691046ac668282de421bd66c14748faac693749 (diff) | |
| parent | 92f1a8af836933a3488e32bb03f859d5548883d7 (diff) | |
| download | tor-ae2085dd7be279b0fc3ff9c582d35a498c63350a.tar.gz tor-ae2085dd7be279b0fc3ff9c582d35a498c63350a.zip | |
Merge branch 'ticket27252-032' into ticket27252-033
Semantic merge:
- Rust offline and online were swapped in ticket27252-032
- TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2
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 09bd04505c..bf01523843 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="" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -69,9 +70,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.) |