Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nick Mathewson
Tor
Commits
518b69b5
Unverified
Commit
518b69b5
authored
Aug 08, 2019
by
teor
Browse files
Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9
parents
fb977f8c
12185462
Changes
2
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
518b69b5
...
...
@@ -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
...
...
changes/ticket30213
0 → 100644
View file @
518b69b5
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.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment