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
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
sergi
Tor
Commits
aff28661
Unverified
Commit
aff28661
authored
5 years ago
by
teor
Browse files
Options
Downloads
Plain Diff
Merge branch 'maint-0.4.2'
parents
a91f52a4
d7c40bee
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+10
-2
10 additions, 2 deletions
.travis.yml
changes/ticket31919_bionic
+5
-0
5 additions, 0 deletions
changes/ticket31919_bionic
with
15 additions
and
2 deletions
.travis.yml
+
10
−
2
View file @
aff28661
...
...
@@ -47,6 +47,14 @@ matrix:
compiler
:
clang
## We run chutney on Linux, because it's faster than chutney on macOS
-
env
:
CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
## (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"
compiler
:
clang
## We include a single coverage build with the best options for coverage
-
env
:
COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" TOR_TEST_RNG_SEED="636f766572616765"
## We run rust on Linux, because it's faster than rust on macOS
...
...
@@ -88,8 +96,8 @@ matrix:
## test-stem sometimes hangs on Travis
-
env
:
TEST_STEM="yes" SKIP_MAKE_CHECK="yes"
## (Linux only) Use
the lates
t Linux image (Ubuntu
Trusty
)
dist
:
trusty
## (Linux only) Use
a recen
t Linux image (Ubuntu
Bionic
)
dist
:
bionic
## Download our dependencies
addons
:
...
...
This diff is collapsed.
Click to expand it.
changes/ticket31919_bionic
0 → 100644
+
5
−
0
View file @
aff28661
o Minor features (continuous integration):
- Use Ubuntu Bionic images for our Travis CI builds, so we can get
a recent version of coccinelle. But leave chutney on Ubuntu Trusty,
until we can fix some Bionic permissions issues (see ticket 32240).
Related to ticket 31919.
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