diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-06-05 16:22:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-06-05 16:22:29 -0400 |
| commit | d63c17f2afb810f5db896b10909fe9ff2bfe7cf9 (patch) | |
| tree | 908e92f66bd6346f1830245920d0e4e8445b7d9a /.travis.yml | |
| parent | e51b57ee047420b929c7d58de70df6ea5ca77565 (diff) | |
| parent | b05b165a75a9d9e912da64788fc873fb215f5d75 (diff) | |
| download | tor-d63c17f2afb810f5db896b10909fe9ff2bfe7cf9.tar.gz tor-d63c17f2afb810f5db896b10909fe9ff2bfe7cf9.zip | |
Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml index 8e258aef26..f78333611f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ env: - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true matrix: - ## include creates builds with gcc, linux, sudo: false + ## include creates builds with gcc, linux include: ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" @@ -71,12 +71,6 @@ matrix: ## allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-allow_failures exclude: - ## Clang doesn't work in containerized builds, see below. - - compiler: clang - sudo: false - ## 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 @@ -92,20 +86,6 @@ matrix: ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" -## We don't need sudo. (The "apt:" stanza after this allows us to not need -## sudo; otherwise, we would need it for getting dependencies.) -## -## But we use "sudo: required" to force 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. -## https://github.com/travis-ci/travis-ci/issues/9033 -## -## In the matrix above, we exclude redundant combinations. -sudo: - - false - - required - ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty |