diff options
| author | rl1987 <rl1987@sdf.lonestar.org> | 2019-04-24 13:29:23 +0300 |
|---|---|---|
| committer | rl1987 <rl1987@sdf.lonestar.org> | 2019-04-30 09:16:33 +0300 |
| commit | 10c71105e6403025f380dee7c3d7e1ce40e8f2b6 (patch) | |
| tree | f79436ae9179f1e97ce23675980d6bb8fa9acb79 /.travis.yml | |
| parent | 593d29920e264180a7a6849fc59224a8869388d7 (diff) | |
| download | tor-10c71105e6403025f380dee7c3d7e1ce40e8f2b6.tar.gz tor-10c71105e6403025f380dee7c3d7e1ce40e8f2b6.zip | |
Travis: remove sudo configuration
See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
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 ab7db2a928..7f20875cf8 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 |