diff options
| author | Guy Harris <guy@alum.mit.edu> | 2020-05-14 17:03:12 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2020-05-14 17:03:12 -0700 |
| commit | a37ced67021c5f4afb14cfc26dd5fee115c78d33 (patch) | |
| tree | f648bae26bd6f221c1a006c602e40eca1fa273f5 /.travis.yml | |
| parent | db556d50b76462a6e5db363257e1efad3d95a93b (diff) | |
| download | tcpdump-a37ced67021c5f4afb14cfc26dd5fee115c78d33.tar.gz | |
travis: try removing the matrix: clause and putting back the Coverity stuff.
Somebody claimed in
https://travis-ci.community/t/if-doesnt-appear-to-work-in-exclude/8595/5
that "matrix: is now an alias to jobs:", and suggested combining them,
so do so.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index f61c8995..b5a23525 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,31 @@ compiler: # compatibility with build scripts etc. that expect the compiler to be # "gcc", so don't bother doing "gcc" builds on macOS. # +# Furthermore, the Coverity-branch builds seem to time out on the +# non-x86 platforms, so suppress them as well. (Are they supported +# at all?) +# +# XXX - what is the fast_finish clause there for? According to +# +# https://docs.travis-ci.com/user/build-matrix/#fast-finishing +# +# "If some rows in the build matrix are allowed to fail, the build +# won't be marked as finished until they have completed. +# +# To mark the build as finished as soon as possible, add fast_finish: +# true to the jobs section of your .travis.yml like this: +# +# jobs: +# fast_finish: true +# +# Now, the build result will be determined as soon as all the required +# jobs finish, based on these results, while the rest of the +# allow_failures jobs continue to run." +# +# but we *have* no allow_failures jobs. +# jobs: + fast_finish: true exclude: - arch: ppc64le os: osx @@ -44,6 +68,12 @@ jobs: os: osx - compiler: gcc os: osx + - if: branch = coverity_scan + arch: ppc64le + - if: branch = coverity_scan + arch: s390x + - if: branch = coverity_scan + arch: arm64 cache: ccache @@ -76,9 +106,6 @@ env: - BUILD_LIBPCAP=yes CMAKE=yes REMOTE=enable CRYPTO=no - BUILD_LIBPCAP=yes CMAKE=yes REMOTE=enable CRYPTO=yes -matrix: - fast_finish: true - addons: coverity_scan: # customized build script URL |