mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-20 04:12:13 +02:00
Travis: Unroll the build matrix into matrix: include:
The jobs should be the same, but Travis may display them differently. Part of 31859.
This commit is contained in:
parent
967460389a
commit
8520071f23
33
.travis.yml
33
.travis.yml
@ -5,14 +5,12 @@ cache:
|
|||||||
|
|
||||||
compiler:
|
compiler:
|
||||||
- gcc
|
- gcc
|
||||||
- clang
|
|
||||||
|
|
||||||
os:
|
os:
|
||||||
- linux
|
- linux
|
||||||
- osx
|
|
||||||
|
|
||||||
## The build matrix in the following stanza expands into builds for each
|
## We don't use the build matrix cross-product, because it makes too many jobs
|
||||||
## OS and compiler.
|
## Instead, we list each job under matrix: include:
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
## The Travis CI environment allows us two cores, so let's use both.
|
## The Travis CI environment allows us two cores, so let's use both.
|
||||||
@ -23,15 +21,17 @@ env:
|
|||||||
## We turn off asciidoc by default, because it's slow
|
## We turn off asciidoc by default, because it's slow
|
||||||
- ASCIIDOC_OPTIONS="--disable-asciidoc"
|
- ASCIIDOC_OPTIONS="--disable-asciidoc"
|
||||||
matrix:
|
matrix:
|
||||||
## We want to use each build option at least once
|
## This matrix entry is required, but it doesn't actually create any jobs
|
||||||
##
|
|
||||||
## We don't list default variable values, because we set the defaults
|
|
||||||
## in global (or the default is unset)
|
|
||||||
-
|
-
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
## include creates builds with gcc, linux
|
## include creates builds with gcc, linux, unless we override those defaults
|
||||||
include:
|
include:
|
||||||
|
## gcc is the default compiler for most jobs, so we want a clang Linux job
|
||||||
|
- compiler: clang
|
||||||
|
## clang is the default macOS compiler, so we use it for the macOS job
|
||||||
|
- compiler: clang
|
||||||
|
os: osx
|
||||||
## We include a single coverage build with the best options for coverage
|
## We include a single coverage build with the best options for coverage
|
||||||
- env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
|
- env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
|
||||||
## We only want to check these build option combinations once
|
## We only want to check these build option combinations once
|
||||||
@ -52,18 +52,11 @@ matrix:
|
|||||||
## https://github.com/travis-ci/travis-ci/issues/1696
|
## https://github.com/travis-ci/travis-ci/issues/1696
|
||||||
# fast_finish: true
|
# fast_finish: true
|
||||||
|
|
||||||
## Careful! We use global envs, which makes it hard to exclude or
|
## Careful! We use global envs, which makes it hard to allow failures by env:
|
||||||
## allow failures by env:
|
|
||||||
## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-allow_failures
|
## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-allow_failures
|
||||||
exclude:
|
# allow_failures:
|
||||||
## gcc on OSX is less useful, because the default compiler is clang.
|
# - compiler: gcc
|
||||||
- compiler: gcc
|
# os: linux
|
||||||
os: osx
|
|
||||||
## gcc on Linux with no env is redundant, because all the custom builds use
|
|
||||||
## gcc on Linux
|
|
||||||
- compiler: gcc
|
|
||||||
os: linux
|
|
||||||
env:
|
|
||||||
|
|
||||||
## (Linux only) Use the latest Linux image (Ubuntu Trusty)
|
## (Linux only) Use the latest Linux image (Ubuntu Trusty)
|
||||||
dist: trusty
|
dist: trusty
|
||||||
|
Loading…
Reference in New Issue
Block a user