From: teor <teor@torproject.org>
Date: Thu, 23 Aug 2018 07:06:53 +0000 (+1000)
Subject: Travis: Skip a duplicate hardening-off build in Tor 0.2.9
X-Git-Tag: tor-0.3.5.2-alpha~8^2~6^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ec84cc0942af27136d27e6a9085e02b07c61da1;p=thirdparty%2Ftor.git

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

Part of 27252.
---

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.