travis: remove cocci and macos builds

These tests are covered by Github actions and removing
them may speed up the Travis builds to get results sooner.

Its still worth keeping some of these builds as they test
more compile time options than the Github Actions currently
do.

diff --git a/.travis.yml b/.travis.yml
index 27e76c001dcb0331ad521186d9275b7eb648d0ef..1a7c4ea836ad93599a988011bcedad0f4b8bc98c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -97,24 +97,6 @@ matrix:
         - DO_CHECK_SETUP_SCRIPTS="yes"
         - DO_DISTCHECK="yes"
   include:
-    # Linux, gcc, coccinelle.
-    - os: linux
-      compiler: gcc-7
-      env:
-        - NAME="linux,gcc-7,cocci"
-        - *default-cflags
-        - NO_UNITTESTS=yes
-      addons:
-        apt:
-          sources:
-            - sourceline: ppa:npalix/coccinelle
-            # For gcc-7.
-            - sourceline: ppa:ubuntu-toolchain-r/test
-          packages:
-            - *packages
-            - coccinelle
-            - gcc-7
-            - python3-sphinx
     # Linux, gcc, Rust (latest stable).
     # This is allowed to fail, update allow_failures if the env changes.
     - os: linux
@@ -192,14 +174,6 @@ matrix:
         - NAME="Unsupported Rust version"
         - RUST_VERSION="1.32.0"
         - CONFIGURE_SHOULD_FAIL="yes"
-    # OSX 10.13, XCode 8.3
-    - os: osx
-      compiler: gcc
-      osx_image: xcode8.3
-      sudo: true
-      env:
-        - NAME="osx,gcc"
-        - *default-cflags
     # Linux, gcc, no nss/nspr.
     - os: linux
       compiler: gcc
@@ -224,41 +198,4 @@ before_install:
     # match the requested version.
     rustup default "${RUST_VERSION}"
     rustc --version
-  - |
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-        brew update
-
-        # Unlink and install each dependency to avoid errors where a
-        # formula might already be installed but is not the current
-        # version.
-        packages=""
-        packages="$packages pkg-config"
-        packages="$packages libmagic"
-        packages="$packages libyaml"
-        packages="$packages nss"
-        packages="$packages nspr"
-        packages="$packages jansson"
-        packages="$packages libnet"
-        packages="$packages lua"
-        packages="$packages pcre"
-        packages="$packages hiredis"
-        packages="$packages jq"
-        packages="$packages xz"
-        for package in $packages; do
-            if brew ls $package --versions > /dev/null; then
-                brew unlink $package
-            fi
-        done
-
-        # Now install.
-        brew install $packages
-
-        # Now relink, becuase if a newer version of a package wasn't
-        # installed above, it will remain unlinked.
-        brew link $packages
-
-        curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-        sudo python ./get-pip.py
-        sudo pip install PyYAML
-    fi
   - ./qa/travis-libhtp.sh

diff --git a/qa/travis.sh b/qa/travis.sh
index b2c46f12511568d0f1e976741c7237d874b4fbbb..760a365892f49ac1c566b0157cf3073c431a6232 100755 (executable)
--- a/qa/travis.sh
+++ b/qa/travis.sh
@@ -8,25 +8,13 @@ if [[ "${NO_UNITTESTS}" != "yes" ]]; then
     ARGS="${ARGS} --enable-unittests"
 fi
 
-if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    export CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}"
-    if ! ./configure --enable-nfqueue --enable-hiredis ${ARGS}; then
-        if [[ "${CONFIGURE_SHOULD_FAIL}" = "yes" ]]; then
-           EXIT_CODE=0
-        else
-           EXIT_CODE=1
-        fi
+export CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}"
+if ! ./configure --enable-nfqueue --enable-hiredis ${ARGS}; then
+    if [[ "${CONFIGURE_SHOULD_FAIL}" = "yes" ]]; then
+       EXIT_CODE=0
+    else
+       EXIT_CODE=1
     fi
-elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    export CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}"
-    ./configure --enable-hiredis --enable-ipfw \
-        --enable-lua --with-libpcre-includes=/usr/local/include \
-        --with-libpcre-includes=/usr/local/include \
-        --with-libpcre-libraries=/usr/local/lib \
-        --with-libnss-includes=/usr/local/opt/nss/include/nss \
-        --with-libnss-libraries=/usr/local/opt/nss/lib \
-        --with-libnspr-includes=/usr/local/opt/nspr/include/nspr \
-        --with-libnspr-libraries=/usr/local/opt/nspr/lib ${ARGS}
 fi
 
 if [[ "${EXIT_CODE}" ]]; then