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
c34c1012
Unverified
Commit
c34c1012
authored
5 years ago
by
teor
Browse files
Options
Downloads
Plain Diff
Merge branch 'bug33195_043' into bug33195_master
parents
e231d84d
3e8e4af1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.travis.yml
+38
-26
38 additions, 26 deletions
.travis.yml
changes/ticket33194
+4
-0
4 additions, 0 deletions
changes/ticket33194
changes/ticket33195
+4
-0
4 additions, 0 deletions
changes/ticket33195
with
46 additions
and
26 deletions
.travis.yml
+
38
−
26
View file @
c34c1012
...
...
@@ -41,34 +41,47 @@ env:
matrix
:
## include creates builds with gcc, linux, unless we override those defaults
include
:
## We run basic tests on macOS
## We run chutney on macOS, because macOS Travis has IPv6
-
env
:
CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
os
:
osx
## We also run basic tests on macOS
-
compiler
:
clang
os
:
osx
## Turn off some newer features, turn on clang's -Wtypedef-redefinition
env
:
C_DIALECT_OPTIONS="-std=gnu99"
## We check NSS
## Use -std=gnu99 to turn off some newer features, and maybe turn on some
## extra gcc warnings?
-
env
:
NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99"
## We run chutney on Linux, because it's faster than chutney on macOS
## 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
## 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
## We check rust offline
-
env
:
RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
## We check asciidoc with distcheck, to make sure we remove doc products
-
env
:
DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
## We check disable module relay
-
env
:
MODULES_OPTIONS="--disable-module-relay"
## We check disable module dirauth
-
env
:
MODULES_OPTIONS="--disable-module-dirauth"
## We run rust on Linux, because it's faster than rust on macOS
## We check rust offline
-
env
:
RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
## We check NSS
## Use -std=gnu99 to turn off some newer features, and maybe turn on some
## extra gcc warnings?
-
env
:
NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99"
## 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 clone our stem repo and run `make test-stem`
-
env
:
TEST_STEM="yes" SKIP_MAKE_CHECK="yes"
## We run `make doxygen` without `make check`.
-
env
:
SKIP_MAKE_CHECK="yes" DOXYGEN="yes"
## macOS builds are very slow, and we have a limited number of
## concurrent macOS jobs. We're not actively developing Rust, so it is
## the lowest priority.
...
...
@@ -76,13 +89,6 @@ matrix:
#- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
# compiler: clang
# os: osx
## We run chutney on macOS, because macOS Travis has IPv6
-
env
:
CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
os
:
osx
## We clone our stem repo and run `make test-stem`
-
env
:
TEST_STEM="yes" SKIP_MAKE_CHECK="yes"
## We run `make doxygen` without `make check`.
-
env
:
SKIP_MAKE_CHECK="yes" DOXYGEN="yes"
## Allow the build to report success (with non-required sub-builds
## continuing to run) if all required sub-builds have succeeded.
...
...
@@ -94,11 +100,17 @@ matrix:
## macOS rust and chutney are very slow, so we let the build finish before
## they are done. We'd like to fast finish, but still eventually show
## any failures in the build status. But Travis doesn't have that ability.
-
env
:
RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
compiler
:
clang
os
:
osx
-
env
:
CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
os
:
osx
## Since this job is disabled, there's not much point having an exception
## for it
#- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
# compiler: clang
# os: osx
## Since we're actively developing IPv6, we want to require the IPv6
## chutney tests
#- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
# os: osx
## (Linux only) Use a recent Linux image (Ubuntu Bionic)
dist
:
bionic
...
...
This diff is collapsed.
Click to expand it.
changes/ticket33194
0 → 100644
+
4
−
0
View file @
c34c1012
o Testing:
- Remove a redundant distcheck job. Closes ticket 33194.
- Sort the Travis jobs in order of speed. Putting the slowest jobs first
takes full advantage of Travis job concurrency. Closes ticket 33194.
This diff is collapsed.
Click to expand it.
changes/ticket33195
0 → 100644
+
4
−
0
View file @
c34c1012
o Testing:
- Stop allowing the Chutney IPv6 Travis job to fail. This job was
previously configured to fast_finish (which requires allow_failure), to
speed up the build. Closes ticket 33195.
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