From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2018 05:04:08 +0000 (+0900)
Subject: Merge branch 'nd/travis-gcc-8'
X-Git-Tag: v2.18.0-rc0~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6105fee3fd7002c7e51932540f723b02885a84e5?hp=a4eae17c2c3f898d2838000c5f1b7c7d66c62316

Merge branch 'nd/travis-gcc-8'

Developer support.  Use newer GCC on one of the builds done at
TravisCI.org to get more warnings and errors diagnosed.

* nd/travis-gcc-8:
travis-ci: run gcc-8 on linux-gcc jobs
---

diff --git a/.travis.yml b/.travis.yml
index 5f5ee4f3bd..4d4e26c9df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,10 +16,13 @@ compiler:
 
 addons:
   apt:
+    sources:
+    - ubuntu-toolchain-r-test
     packages:
     - language-pack-is
     - git-svn
     - apache2
+    - gcc-8
 
 matrix:
   include:
diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh
index 109ef280da..ceecc889ca 100755
--- a/ci/lib-travisci.sh
+++ b/ci/lib-travisci.sh
@@ -99,6 +99,9 @@ export DEFAULT_TEST_TARGET=prove
 export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
 export GIT_TEST_OPTS="--verbose-log -x"
 export GIT_TEST_CLONE_2GB=YesPlease
+if [ "$jobname" = linux-gcc ]; then
+	export CC=gcc-8
+fi
 
 case "$jobname" in
 linux-clang|linux-gcc)