Merge remote-tracking branch 'tor-github/pr/989'

This commit is contained in:
Nick Mathewson 2019-05-02 08:36:09 -04:00
commit 0a2b96cae6
2 changed files with 4 additions and 21 deletions

View File

@ -39,7 +39,7 @@ env:
- RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
matrix: matrix:
## include creates builds with gcc, linux, sudo: false ## include creates builds with gcc, linux
include: include:
## We include a single coverage build with the best options for coverage ## We include a single coverage build with the best options for coverage
- env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
@ -71,12 +71,6 @@ matrix:
## allow failures by env: ## allow failures by env:
## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-allow_failures ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-allow_failures
exclude: 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. ## gcc on OSX is less useful, because the default compiler is clang.
- compiler: gcc - compiler: gcc
os: osx os: osx
@ -92,20 +86,6 @@ matrix:
## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2
env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" 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) ## (Linux only) Use the latest Linux image (Ubuntu Trusty)
dist: trusty dist: trusty

3
changes/ticket30213 Normal file
View File

@ -0,0 +1,3 @@
o Minor features (continuous integration):
- Remove sudo configuration lines from .travis.yml as they are no longer
needed with current Travis build environment. Resolves issue 30213.