From ddd63077b4c4c756f9008ee4bc12e7a08a0a2f72 Mon Sep 17 00:00:00 2001
From: Isaac Hier <ihier@uber.com>
Date: Sun, 28 Jan 2018 08:25:36 -0500
Subject: [PATCH 1/2] Add GCC 7 and non-Hunter build to Travis

Signed-off-by: Isaac Hier <ihier@uber.com>
---
 .travis.yml      | 14 ++++++++++++--
 scripts/build.sh | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a678c9b0..fdc79122 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,17 @@ sudo: true
 dist: trusty
 matrix:
   include:
+  - os: linux
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - g++-7
+        - lcov
+    env:
+    - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+    - COVERAGE=ON
   - os: linux
     addons:
       apt:
@@ -13,7 +24,6 @@ matrix:
         - lcov
     env:
     - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
-    - COVERAGE=ON
   - os: linux
     addons:
       apt:
@@ -36,7 +46,7 @@ before_install:
 script:
   - ./scripts/build.sh
 after_success:
-- for f in $(find build -name '*.gcno'); do gcov-6 $f; done
+- for f in $(find build -name '*.gcno'); do gcov-7 $f; done
 - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage
   reports"
 cache:
diff --git a/scripts/build.sh b/scripts/build.sh
index 1c850b97..15e1b0ee 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -21,12 +21,22 @@ function working() {
 
 mkdir -p build
 cd build || exit
+
+cmake_opts="-DCMAKE_BUILD_TYPE=Debug"
 if [ "x$COVERAGE" != "x" ]; then
-  cmake -DCMAKE_BUILD_TYPE=Debug -DJAEGERTRACING_COVERAGE=ON ..
+  cmake_opts="$cmake_opts -DJAEGERTRACING_COVERAGE=ON"
 else
-  cmake -DCMAKE_BUILD_TYPE=Debug -DJAEGERTRACING_COVERAGE=OFF ..
+  cmake_opts="$cmake_opts -DJAEGERTRACING_COVERAGE=OFF"
 fi
 
+if [ "x$NO_HUNTER" != "x" ]; then
+  cmake_opts="$cmake_opts -DHUNTER_ENABLED=OFF"
+else
+  cmake_opts="$cmake_opts -DHUNTER_ENABLED=ON"
+fi
+
+cmake $cmake_opts ..
+
 if make -j3 UnitTest; then
     true
 else

From 08c9c651ad97d1e080a6b062b7e156666ae2fb9a Mon Sep 17 00:00:00 2001
From: Isaac Hier <ihier@uber.com>
Date: Sun, 28 Jan 2018 08:42:09 -0500
Subject: [PATCH 2/2] Fix matrix

Signed-off-by: Isaac Hier <ihier@uber.com>
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index fdc79122..5712bc4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ matrix:
         - lcov
     env:
     - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
+    - NO_HUNTER=ON
   - os: linux
     addons:
       apt: