diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-11 13:08:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-11 13:08:57 -0400 |
| commit | 198b6354e6c58ab4276461b5215487b8e9c15683 (patch) | |
| tree | e8a8b95f91f9a7b95dde6c0827729cdc94eae9c8 | |
| parent | 19429fac23734070933591774d2436bf92896297 (diff) | |
| parent | 7cea5a287fbf0ed1b9ed92e144ff450c4f93f382 (diff) | |
| download | tor-198b6354e6c58ab4276461b5215487b8e9c15683.tar.gz tor-198b6354e6c58ab4276461b5215487b8e9c15683.zip | |
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | changes/ticket27252 | 6 |
2 files changed, 17 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index a323b4ecd4..06db583e1e 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="" @@ -55,9 +56,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 new file mode 100644 index 0000000000..410ddef8c0 --- /dev/null +++ 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. |