diff options
author | Taylor Yu <catalyst@torproject.org> | 2018-01-10 14:52:04 -0600 |
---|---|---|
committer | Taylor Yu <catalyst@torproject.org> | 2018-01-17 13:40:34 -0600 |
commit | 49de586add6394c7a04c9a982fbe66b185cf4e58 (patch) | |
tree | 46f324206488a0a8293bfa9493cc0ec09dd377b1 | |
parent | 8efbeb09826030302481619dab83e83f35fdc26e (diff) | |
download | tor-49de586add6394c7a04c9a982fbe66b185cf4e58.tar.gz tor-49de586add6394c7a04c9a982fbe66b185cf4e58.zip |
Work around Travis CI ptrace regression
Travis CI deployed a change that disables ptrace capabilities in
container builds, which prevents LeakSanitizer on clang from working
properly. Set "sudo: required" to force non-container builds for
clang and work around this.
-rw-r--r-- | .travis.yml | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 59b32dbe42..60f82af3f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: c -compiler: - - gcc - - clang +## Comment out the compiler list for now to allow an explicit build +## matrix. +# compiler: +# - gcc +# - clang notifications: irc: @@ -28,6 +30,10 @@ dist: trusty ## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; ## 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 ## (Linux only) Download our dependencies @@ -61,6 +67,18 @@ matrix: ## entire job early and call the whole thing a failure. 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: ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi |