aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2018-08-10 11:59:42 +1000
committerteor <teor@torproject.org>2018-08-10 16:37:06 +1000
commitf5aa667d48d88f917371219ddefce26637c2b1ad (patch)
tree5a80ef62f55d470c6724dfb498ced02c2c21c6de
parenta544af818671eae8f265c687e24349061d3b8450 (diff)
downloadtor-f5aa667d48d88f917371219ddefce26637c2b1ad.tar.gz
tor-f5aa667d48d88f917371219ddefce26637c2b1ad.zip
Travis: Check Rust with distcheck in 0.3.3 and later
Backports an 0.3.4 change that also works in 0.3.3. Part of 24629.
-rw-r--r--.travis.yml5
-rw-r--r--changes/ticket24629-backport3
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index e599950620..3d86fdc1b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,8 +50,9 @@ matrix:
# - env: HARDENING_OPTIONS=""
## We check asciidoc with distcheck, to make sure we remove doc products
- env: ASCIIDOC_OPTIONS="" DISTCHECK="yes"
- ## Check rust offline without distcheck (see above)
- - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
+ ## Check rust offline 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=""
## 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/ticket24629-backport b/changes/ticket24629-backport
new file mode 100644
index 0000000000..dfbc465634
--- /dev/null
+++ b/changes/ticket24629-backport
@@ -0,0 +1,3 @@
+ o Minor features (continuous integration):
+ - Backport Travis rust distcheck to 0.3.3.
+ Closes ticket 24629.