Merge branch 'maint-0.2.9' into maint-0.3.0

This commit is contained in:
Nick Mathewson 2018-01-19 10:17:05 -05:00
commit 1cf11b6940

View File

@ -1,8 +1,10 @@
language: c language: c
compiler: ## Comment out the compiler list for now to allow an explicit build
- gcc ## matrix.
- clang # compiler:
# - gcc
# - clang
notifications: notifications:
irc: irc:
@ -28,6 +30,10 @@ dist: trusty
## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; ## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo;
## otherwise, we would need it for getting dependencies.) ## otherwise, we would need it for getting dependencies.)
##
## We override this in the explicit build matrix to work around a
## Travis CI environment regression
## https://github.com/travis-ci/travis-ci/issues/9033
sudo: false sudo: false
## (Linux only) Download our dependencies ## (Linux only) Download our dependencies
@ -61,6 +67,18 @@ matrix:
## entire job early and call the whole thing a failure. ## entire job early and call the whole thing a failure.
fast_finish: true fast_finish: true
## Create explicit matrix entries to work around a Travis CI
## environment issue. Missing keys inherit from the first list
## entry under that key outside the "include" clause.
include:
- compiler: gcc
## The "sudo: required" forces non-containerized builds, working
## around a Travis CI environment issue: clang LeakAnalyzer fails
## because it requires ptrace and the containerized environment no
## longer allows ptrace.
- compiler: clang
sudo: required
before_install: before_install:
## If we're on OSX, homebrew usually needs to updated first ## If we're on OSX, homebrew usually needs to updated first
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi