From 1716352f6f904d688f66c034222b5a86046cf653 Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Mon, 16 Mar 2020 22:59:08 +0000
Subject: travis: remove redundant jobs, update to xcode11.3

* Remove amd64+gcc-8 NOPCAP in favor of the faster clang NOPCAP. GitLab
  CI builds showed that both builds would catch the same issues.
* Remove NOPCAP macOS, it is very uncommon so do not waste cycles on it.
* Remove amd64+gcc-8 as amd64+gcc-9 covers the same plus more.
* Remove unnecessary PPA, gcc-8 is included with bionic by default.
* Remove Xcode10.3 build to save resources.
* Update Xcode11.2 to the latest Xcode11.3, no compiler changes.

Change-Id: Iddaa20b865fe16380844f266fc68d394f979a14c
Reviewed-on: https://code.wireshark.org/review/36478
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
---
 .travis.yml | 45 ++-------------------------------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4747bde0d7..474cd6fd04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,24 +2,10 @@ language: minimal
 dist: bionic
 matrix:
   include:
-    - name: OSX (xcode10.3 clang-10.0.1) with PCAP
+    - name: OSX (xcode11.3 clang-11.0.0) with PCAP
       os: osx
-      osx_image: xcode10.3
-      compiler: clang
+      osx_image: xcode11.3
       env: PCAP=ON
-    - name: OSX (xcode10.3 clang-10.0.1) without PCAP
-      os: osx
-      osx_image: xcode10.3
-      compiler: clang
-      env: PCAP=OFF
-    - name: OSX (xcode11.2 clang-11.0.0) with PCAP
-      os: osx
-      osx_image: xcode11.2
-      env: PCAP=ON
-    - name: OSX (xcode11.2 clang-11.0.0) without PCAP
-      os: osx
-      osx_image: xcode11.2
-      env: PCAP=OFF
     - name: Linux amd64 (gcc-9) with PCAP
       os: linux
       addons:
@@ -33,26 +19,11 @@ matrix:
         - CXX=g++-9
         - CC=gcc-9
         - PCAP=ON
-    - name: Linux amd64 (gcc-8) with PCAP
-      os: linux
-      addons:
-        apt:
-          update: true
-          sources:
-            - ubuntu-toolchain-r-test
-          packages: g++-8
-      env:
-        - CXX=g++-8
-        - CC=gcc-8
-        - PCAP=ON
     - name: Linux arm64 (gcc-8) with PCAP
       os: linux
       arch: arm64
       addons:
         apt:
-          update: true
-          sources:
-            - ubuntu-toolchain-r-test
           packages: g++-8
       env:
         - CXX=g++-8
@@ -68,18 +39,6 @@ matrix:
       arch: ppc64le
       env:
         - PCAP=ON
-    - name: Linux amd64 (gcc-8) without PCAP
-      os: linux
-      addons:
-        apt:
-          update: true
-          sources:
-            - ubuntu-toolchain-r-test
-          packages: g++-8
-      env:
-        - CXX=g++-8
-        - CC=gcc-8
-        - PCAP=OFF
     - name: Linux amd64 (clang) with PCAP
       os: linux
       env:
-- 
cgit v1.2.3