From e88f33ba949fce0c08d07c3c4c6c762bd01f1385 Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Sat, 12 Aug 2017 17:18:31 +0100 Subject: [PATCH] [TravisCI] Unbreak showing interactive log output for non-LTO builds. c2f69ae9fbdcad143557309dd021aa7cafb21d36 added the use of the `travis_wait` command to all builds but this stops interactive build output from showing in the TravisCI web interface. To limit the scope of this change we only use it for LTO builds now. --- .travis.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b179c5bfe..672d8ed52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,7 +65,11 @@ env: # - os: osx # osx_image: xcode 8.2 script: - # Use `travis_wait` to handle commands that don't show output for a long period of time. - # Currently this is the LTO build which can be very slow. - # Allow at most 45 minutes for the build. - - travis_wait 45 contrib/ci/scripts/travis_ci_entry_point.sh + # Use `travis_wait` when doing LTO builds because this configuration will + # have long link times during which it will not show any output which + # TravisCI might kill due to perceived inactivity. + - if [ "X${USE_LTO}" = "X1" ]; then + travis_wait 45 contrib/ci/scripts/travis_ci_entry_point.sh || exit 1; + else + contrib/ci/scripts/travis_ci_entry_point.sh || exit 1; + fi