aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2018-08-23 17:06:53 +1000
committerteor <teor@torproject.org>2018-08-23 17:08:28 +1000
commit7ec84cc0942af27136d27e6a9085e02b07c61da1 (patch)
tree5de8809a9add54d9ee0d54e66620f73ac4b2c921
parent8f89fb8f398c365588d456625c77cdaee97c77bd (diff)
downloadtor-7ec84cc0942af27136d27e6a9085e02b07c61da1.tar.gz
tor-7ec84cc0942af27136d27e6a9085e02b07c61da1.zip
Travis: Skip a duplicate hardening-off build in Tor 0.2.9
Part of 27252.
-rw-r--r--.travis.yml3
-rw-r--r--changes/ticket272521
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 102b500308..74a248fda6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,8 @@ matrix:
- env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
## We only want to check these build option combinations once
## (they shouldn't vary by compiler or OS)
- - env: HARDENING_OPTIONS=""
+ ## We run coverage with hardening off, which seems like enough
+ # - env: HARDENING_OPTIONS=""
## We check asciidoc with distcheck, to make sure we remove doc products
- env: DISTCHECK="yes" ASCIIDOC_OPTIONS=""
diff --git a/changes/ticket27252 b/changes/ticket27252
index f0855db1d4..2ee4c8217f 100644
--- a/changes/ticket27252
+++ b/changes/ticket27252
@@ -1,3 +1,4 @@
o Minor features (continuous integration):
- Skip gcc on OSX in Travis CI, it's rarely used.
+ Skip a duplicate hardening-off build in Travis on Tor 0.2.9.
Implements ticket 27252.