diff options
author | Guy Harris <guy@alum.mit.edu> | 2020-05-14 04:30:55 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2020-05-14 04:30:55 -0700 |
commit | e4f2e97ad06b55b9fc7bcd3df32ce21cee894c6b (patch) | |
tree | e11192bbf5f7c196ea9451085b38a9161ee660f0 /.travis.yml | |
parent | f407da2fc28b8a82a9c6540e8e1dfd627c091412 (diff) | |
download | tcpdump-e4f2e97ad06b55b9fc7bcd3df32ce21cee894c6b.tar.gz |
travis: OK, I give up.
See
https://travis-ci.community/t/if-doesnt-appear-to-work-in-exclude/8595
for the complaint.
Go back to the previous list of excluded builds, and get rid of the
extra messages thrown into the script, as they do *not* prevent the
Coverity scan builds from failing on the experimental platforms.
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index e3debe54..f61c8995 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,13 +34,16 @@ 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?) -# jobs: exclude: - - os: linux + - arch: ppc64le + os: osx + - arch: s390x + os: osx + - arch: arm64 + os: osx + - compiler: gcc + os: osx cache: ccache @@ -124,9 +127,7 @@ before_script: - if [ "$BUILD_LIBPCAP" = yes ]; then (cd .. && echo '$ git clone [...] libpcap.git' && git clone --depth 3 --branch=master --quiet git://github.com/the-tcpdump-group/libpcap.git && cd libpcap && ./configure "--${REMOTE}-remote" --prefix=/tmp && make && make install); fi script: - - if [ "$COVERITY_SCAN_BRANCH" = 1 ]; then echo "Coverity build - nothing more to do"; fi - if [ "$COVERITY_SCAN_BRANCH" = 1 ]; then exit 0; fi - - echo "One last message" - if [ "$TRAVIS_OS_NAME" = osx ]; then OSX_SSL_DIR=$(ls /usr/local/Cellar/openssl); echo "OSX_SSL_DIR=$OSX_SSL_DIR"; fi - touch .devel configure - if [ "$CMAKE" = no ]; then echo '$ ./configure [...]' && echo travis_fold:start:script.configure; fi |