aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2019-08-20 05:03:58 +0200
committerteor <teor@torproject.org>2019-08-22 22:09:32 +1000
commit190386f1c44462fbef568ca9e3c1c997dbebcf12 (patch)
treea9dc38ffa9308684f6c840e0530139f8fe815318
parent5653b93a1d25e173bebb8f45d364e3a578572789 (diff)
downloadtor-190386f1c44462fbef568ca9e3c1c997dbebcf12.tar.gz
tor-190386f1c44462fbef568ca9e3c1c997dbebcf12.zip
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.
-rw-r--r--.travis.yml2
-rw-r--r--changes/bug314633
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 428c6a0007..ef2e419985 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 0000000000..d85c0887c3
--- /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.