commit 518b69b57cbb33bc382892377d4b1208e14d8a8d
parent fb977f8cac99c008f11e054f07b8c4be5fc5a0c5
Author: teor <teor@torproject.org>
Date: Thu, 8 Aug 2019 10:54:12 +1000
Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9
Diffstat:
2 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,7 @@ env:
-
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=""
@@ -53,12 +53,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
@@ -68,20 +62,6 @@ matrix:
os: linux
env:
-## 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
diff --git a/changes/ticket30213 b/changes/ticket30213
@@ -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.
