diff options
| author | teor <teor@torproject.org> | 2018-08-23 17:24:38 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-23 18:18:14 +1000 |
| commit | 92f1a8af836933a3488e32bb03f859d5548883d7 (patch) | |
| tree | 59b14812b897149f165dff94ceeabd63d5304894 | |
| parent | b61d40c8a24ccbd5a08038f9d4d2d38cf987c400 (diff) | |
| download | tor-92f1a8af836933a3488e32bb03f859d5548883d7.tar.gz tor-92f1a8af836933a3488e32bb03f859d5548883d7.zip | |
Travis: Skip offline rust builds for Linux gcc
We already do an online rust build for Linux gcc.
Part of 27252.
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | changes/ticket27252-032 | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 578a671d9f..bbf0b575bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,6 +81,12 @@ matrix: - 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" 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.) diff --git a/changes/ticket27252-032 b/changes/ticket27252-032 index 5761f04d69..4752aedcf6 100644 --- a/changes/ticket27252-032 +++ b/changes/ticket27252-032 @@ -1,3 +1,5 @@ o Minor features (continuous integration): - Only run one online rust build in Travis, to reduce network errors. + Skip offline rust builds on Travis for Linux gcc, because they're + redundant. Implements ticket 27252. |