[tor-commits] [tor/maint-0.4.1] Fix gcc build exclude on travis

nickm at torproject.org nickm at torproject.org
Sat Aug 24 20:29:37 UTC 2019


commit 190386f1c44462fbef568ca9e3c1c997dbebcf12
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Tue Aug 20 05:03:58 2019 +0200

    Fix gcc build exclude on travis
    
    The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't,
    either. Reduces the number of builders by one.
---
 .travis.yml      | 2 +-
 changes/bug31463 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 428c6a000..ef2e41998 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,7 +91,7 @@ matrix:
     - 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=""
+      env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
 
 ## (Linux only) Use the latest Linux image (Ubuntu Trusty)
 dist: trusty
diff --git a/changes/bug31463 b/changes/bug31463
new file mode 100644
index 000000000..d85c0887c
--- /dev/null
+++ b/changes/bug31463
@@ -0,0 +1,3 @@
+  o Minor bugfixes (rust):
+    - Correctly exclude a redundant rust build job in Travis. Fixes bug 31463;
+      bugfix on 0.3.5.4-alpha.





More information about the tor-commits mailing list