aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml37
1 files changed, 18 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml
index f47fe8bb2c..564c97dbfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,34 +27,33 @@ env:
matrix:
## include creates builds with gcc, linux, unless we override those defaults
include:
- ## clang is the default macOS compiler, so we use it for the macOS job
+ ## We run basic tests on macOS
- compiler: clang
os: osx
- ## We include a single coverage build with the best options for coverage
- - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
- ## We only want to check these build option combinations once
- ## (they shouldn't vary by compiler or OS)
- ## We run coverage with hardening off, which seems like enough
- # - env: HARDENING_OPTIONS=""
+ ## We run chutney on Linux, because it's faster than chutney on macOS
+ - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
## 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"
- # We also try running a hardened clang build with chutney on Linux.
- - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2"
compiler: clang
+ ## We include a single coverage build with the best options for coverage
+ - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
+ ## We run chutney on macOS, because macOS Travis has IPv6
+ - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
+ os: osx
- ## Uncomment to allow the build to report success (with non-required
- ## sub-builds continuing to run) if all required sub-builds have
- ## succeeded. This is somewhat buggy currently: it can cause
- ## duplicate notifications and prematurely report success if a
- ## single sub-build has succeeded. See
- ## https://github.com/travis-ci/travis-ci/issues/1696
- # fast_finish: true
+ ## Allow the build to report success (with non-required sub-builds
+ ## continuing to run) if all required sub-builds have succeeded.
+ fast_finish: true
## Careful! We use global envs, which makes it hard to allow failures by env:
## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-allow_failures
- # allow_failures:
- # - compiler: gcc
- # os: linux
+ allow_failures:
+ ## macOS chutney is very slow, so we let the build finish before it's done
+ ## We'd like to fast finish, but still eventually show failures.
+ ## But Travis doesn't have that option.
+ - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
+ os: osx
## (Linux only) Use the latest Linux image (Ubuntu Trusty)
dist: trusty