commit 7ec84cc0942af27136d27e6a9085e02b07c61da1 Author: teor teor@torproject.org Date: Thu Aug 23 17:06:53 2018 +1000

Travis: Skip a duplicate hardening-off build in Tor 0.2.9

Part of 27252. --- .travis.yml | 3 ++- changes/ticket27252 | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml index 102b50030..74a248fda 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 f0855db1d..2ee4c8217 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.