From 222a81f85dfea32f518f68eda51d9f45e1bcc46a Mon Sep 17 00:00:00 2001
From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 6 Dec 2019 15:10:23 -0600
Subject: [PATCH] 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.
---
 .travis.yml  | 63 ----------------------------------------------------
 qa/travis.sh | 24 +++++---------------
 2 files changed, 6 insertions(+), 81 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 27e76c001d..1a7c4ea836 100644
--- 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 b2c46f1251..760a365892 100755
--- 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