diff options
| author | teor <teor@torproject.org> | 2018-08-23 17:23:38 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-23 18:17:03 +1000 |
| commit | b61d40c8a24ccbd5a08038f9d4d2d38cf987c400 (patch) | |
| tree | 18d7865ae3ddb86a3db80e329c93c37d3334924a | |
| parent | 99a2ecc79562dc340f73f998e5c441f3a7968e1a (diff) | |
| download | tor-b61d40c8a24ccbd5a08038f9d4d2d38cf987c400.tar.gz tor-b61d40c8a24ccbd5a08038f9d4d2d38cf987c400.zip | |
Travis: Only run one online rust build, to reduce network errors
Part of 27252.
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | changes/ticket27252-032 | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 74b9d98dad..578a671d9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ 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="" + - RUST_OPTIONS="--enable-rust" RUST_DEPENDENCIES=true HARDENING_OPTIONS="" matrix: ## include creates builds with gcc, linux, sudo: false @@ -50,10 +50,10 @@ matrix: # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" - ## Check rust offline without hardening (see above), or distcheck + ## Check rust online without hardening (see above), and without distcheck ## Distcheck doesn't work with rust in 0.3.2 ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - - env: RUST_OPTIONS="--enable-rust" RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + - env: 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 diff --git a/changes/ticket27252-032 b/changes/ticket27252-032 new file mode 100644 index 0000000000..5761f04d69 --- /dev/null +++ b/changes/ticket27252-032 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Only run one online rust build in Travis, to reduce network errors. + Implements ticket 27252. |