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
e2f78396
Unverified
Commit
e2f78396
authored
5 years ago
by
teor
Browse files
Options
Downloads
Plain Diff
Merge branch 'bug32240_035' into bug32240_040
parents
74811729
75096de4
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
+3
-4
3 additions, 4 deletions
.travis.yml
changes/ticket32240
+4
-0
4 additions, 0 deletions
changes/ticket32240
with
7 additions
and
4 deletions
.travis.yml
+
3
−
4
View file @
e2f78396
...
...
@@ -29,6 +29,9 @@ env:
-
HARDENING_OPTIONS="--enable-expensive-hardening"
## We turn off asciidoc by default, because it's slow
-
ASCIIDOC_OPTIONS="--disable-asciidoc"
## Turn off tor's sandbox in chutney, until we fix sandbox errors that are
## triggered by Ubuntu Xenial and Bionic. See #32722.
-
CHUTNEY_TOR_SANDBOX="0"
matrix
:
## This matrix entry is required, but it doesn't actually create any jobs
-
...
...
@@ -49,10 +52,6 @@ matrix:
## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang
-
env
:
CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
compiler
:
clang
## (Linux only) Use an older Linux image (Ubuntu Trusty)
## The Xenial and Bionic images cause permissions issues for chutney,
## this is a workaround, until we fix #32240.
dist
:
trusty
## We check asciidoc with distcheck, to make sure we remove doc products
## We use Linux clang, because there are no other Linux clang jobs
-
env
:
DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
...
...
This diff is collapsed.
Click to expand it.
changes/ticket32240
0 → 100644
+
4
−
0
View file @
e2f78396
o Testing:
- Turn off Tor's Sandbox in Chutney jobs, and run those jobs on Ubuntu
Bionic. Turning off the Sandbox is a work-around, until we fix the
sandbox errors in 32722. Closes ticket 32240.
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