From 0d6dfef7a7c0aac479d85bf212bb5cc01e7f224c Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Sun, 17 Mar 2019 10:59:14 -0400 Subject: [PATCH 1/3] build: use Xenial and gcc 6 on Travis --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3de388e838436f..2569b44ec39e83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: cpp cache: ccache os: linux +dist: xenial matrix: include: - name: "First commit message adheres to guidelines at https://goo.gl/p2fr5Q" @@ -24,9 +25,9 @@ matrix: sources: - ubuntu-toolchain-r-test packages: - - g++-4.9 + - g++-6 install: - - export CC='ccache gcc-4.9' CXX='ccache g++-4.9' JOBS=2 + - export CC='ccache gcc-6' CXX='ccache g++-6' JOBS=2 - ./configure - make -j2 V= script: From 2bbf24d568a5d3b1f05bc0afbc484e27099a7d2d Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 21 Mar 2019 20:35:05 -0400 Subject: [PATCH 2/3] build: temporarily don't run tests on Travis We're hitting the Travis job timeout of 50mins if built with a new compiler (as there is no ccache). Temporarily disable the running of tests so the Travis job can complete within the timeout and populate the ccache. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2569b44ec39e83..d56eab59e2f05c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,4 +31,4 @@ matrix: - ./configure - make -j2 V= script: - - PARALLEL_ARGS='--flaky-tests=skip' make -j1 test + - # PARALLEL_ARGS='--flaky-tests=skip' make -j1 test From ed8b06782fb3c30204d832461348da6d05760b0c Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 21 Mar 2019 20:38:26 -0400 Subject: [PATCH 3/3] build: restore running tests on Travis Restore running tests on Travis once the ccache is populated. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d56eab59e2f05c..2569b44ec39e83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,4 +31,4 @@ matrix: - ./configure - make -j2 V= script: - - # PARALLEL_ARGS='--flaky-tests=skip' make -j1 test + - PARALLEL_ARGS='--flaky-tests=skip' make -j1 test