From: teor <teor@torproject.org>
Date: Fri, 10 Aug 2018 01:59:42 +0000 (+1000)
Subject: Travis: Check Rust with distcheck in 0.3.3 and later
X-Git-Tag: tor-0.3.4.7-rc~12^2~1^2~3^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ec75e014fb7e736cdf392a4ca11196c0d492044;p=thirdparty%2Ftor.git

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.
---

diff --git a/.travis.yml b/.travis.yml
index 81f449797b..f1b89e1030 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: DISTCHECK="yes" ASCIIDOC_OPTIONS=""
-    ## 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.