commit 99a2ecc79562dc340f73f998e5c441f3a7968e1a
parent c1ad40627bbccf2682f56053c77ff719c822cbce
Author: teor <teor@torproject.org>
Date: Thu, 23 Aug 2018 18:15:55 +1000
Merge branch 'ticket27252-029' into ticket27252-032
This commit is already implemented in 0.3.2 and later:
- Travis: Skip a duplicate hardening-off build in Tor 0.2.9
Diffstat:
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
@@ -70,9 +70,17 @@ matrix:
## Clang doesn't work in containerized builds, see below.
- compiler: clang
sudo: false
- ## We also exclude non-containerized gcc, because they're slow and redundant.
+ ## Non-containerized gcc are slow and redundant.
- compiler: gcc
sudo: required
+ ## gcc on OSX is less useful, because the default compiler is clang.
+ - compiler: gcc
+ os: osx
+ ## gcc on Linux with no env is redundant, because all the custom builds use
+ ## gcc on Linux
+ - compiler: gcc
+ os: linux
+ env:
## We don't need sudo. (The "apt:" stanza after this allows us to not need
## sudo; otherwise, we would need it for getting dependencies.)
diff --git a/changes/ticket27252 b/changes/ticket27252
@@ -0,0 +1,6 @@
+ 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.
+ Skip gcc on Linux with default settings, because all the non-default
+ builds use gcc on Linux.
+ Implements ticket 27252.
