Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Core
Tor
Commits
518b69b5
Unverified
Commit
518b69b5
authored
5 years ago
by
teor
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9
parents
fb977f8c
12185462
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+1
-21
1 addition, 21 deletions
.travis.yml
changes/ticket30213
+3
-0
3 additions, 0 deletions
changes/ticket30213
with
4 additions
and
21 deletions
.travis.yml
+
1
−
21
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
...
...
This diff is collapsed.
Click to expand it.
changes/ticket30213
0 → 100644
+
3
−
0
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.
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment