From 81327b9443ecbc89eb2aae1ba8bad69fa81599ba Mon Sep 17 00:00:00 2001
From: Erik Rigtorp <erigtorp@charlesworthresearch.com>
Date: Sun, 9 Jun 2019 23:20:37 -0500
Subject: [PATCH 1/2] Move linux distro selection to global scope

---
 .travis.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad74089fdf..37c8d11547 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+dist: xenial
+
 sudo: false
 
 matrix:
@@ -7,21 +9,18 @@ matrix:
       language: java
       jdk: openjdk8
       os: linux
-      dist: xenial
       script: ./gradlew --scan
 
     - name: "OpenJDK 11"
       language: java
       jdk: openjdk11
       os: linux
-      dist: xenial
       script: ./gradlew --scan
 
     - env: COMPILER=g++-6
       language: cpp
       compiler: gcc
       os: linux
-      dist: xenial
       addons:
         apt:
           packages:
@@ -35,7 +34,6 @@ matrix:
       language: cpp
       compiler: gcc
       os: linux
-      dist: xenial
       addons:
         apt:
           packages:
@@ -49,7 +47,6 @@ matrix:
       language: cpp
       compiler: gcc
       os: linux
-      dist: xenial
       addons:
         apt:
           packages:
@@ -63,7 +60,6 @@ matrix:
       language: cpp
       compiler: clang
       os: linux
-      dist: xenial
       addons:
         apt:
           packages:
@@ -79,7 +75,6 @@ matrix:
       language: cpp
       compiler: clang
       os: linux
-      dist: xenial
       addons:
         apt:
           packages:
@@ -95,7 +90,6 @@ matrix:
       language: cpp
       compiler: clang
       os: linux
-      dist: xenial
       addons:
         apt:
           packages:

From a730646490f53540054ae2111d2e78677716e855 Mon Sep 17 00:00:00 2001
From: Erik Rigtorp <erigtorp@charlesworthresearch.com>
Date: Sun, 9 Jun 2019 23:24:06 -0500
Subject: [PATCH 2/2] Add more C++ compilers to build matrix

---
 .travis.yml | 58 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37c8d11547..1d367428fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,19 @@ matrix:
       os: linux
       script: ./gradlew --scan
 
+    - env: COMPILER=g++-5
+      language: cpp
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages:
+            - g++-5
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+      script: ./cppbuild/cppbuild
+
     - env: COMPILER=g++-6
       language: cpp
       compiler: gcc
@@ -56,6 +69,32 @@ matrix:
             - ubuntu-toolchain-r-test
       script: ./cppbuild/cppbuild
 
+    - env: COMPILER=g++-9
+      language: cpp
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages:
+            - g++-9
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+      script: ./cppbuild/cppbuild
+
+    - env: COMPILER=clang++-4.0
+      language: cpp
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages:
+            - clang-4.0
+            - libsparsehash-dev
+          sources:
+            - llvm-toolchain-xenial-4.0
+      script: ./cppbuild/cppbuild
+
     - env: COMPILER=clang++-5.0
       language: cpp
       compiler: clang
@@ -64,10 +103,8 @@ matrix:
         apt:
           packages:
             - clang-5.0
-            - libstdc++-7-dev
             - libsparsehash-dev
           sources:
-            - ubuntu-toolchain-r-test
             - llvm-toolchain-xenial-5.0
       script: ./cppbuild/cppbuild
 
@@ -79,10 +116,8 @@ matrix:
         apt:
           packages:
             - clang-6.0
-            - libstdc++-7-dev
             - libsparsehash-dev
           sources:
-            - ubuntu-toolchain-r-test
             - llvm-toolchain-xenial-6.0
       script: ./cppbuild/cppbuild
 
@@ -94,13 +129,24 @@ matrix:
         apt:
           packages:
             - clang-7
-            - libstdc++-7-dev
             - libsparsehash-dev
           sources:
-            - ubuntu-toolchain-r-test
             - llvm-toolchain-xenial-7
       script: ./cppbuild/cppbuild
 
+    - env: COMPILER=clang++-8
+      language: cpp
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages:
+            - clang-8
+            - libsparsehash-dev
+          sources:
+            - llvm-toolchain-xenial-8
+      script: ./cppbuild/cppbuild
+
     - env: COMPILER=clang++
       language: c++
       compiler: clang