]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Fix gcc build exclude on travis
authorSebastian Hahn <sebastian@torproject.org>
Tue, 20 Aug 2019 03:03:58 +0000 (05:03 +0200)
committerteor <teor@torproject.org>
Thu, 22 Aug 2019 12:09:32 +0000 (22:09 +1000)
The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't,
either. Reduces the number of builders by one.

.travis.yml
changes/bug31463 [new file with mode: 0644]

index 428c6a000767c9a66b065e6cb76797afd3cff718..ef2e419985564e879aa705758ad26704c8801376 100644 (file)
@@ -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 (file)
index 0000000..d85c088
--- /dev/null
@@ -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.