From bc8d9d40bdd408383b8a674c89e3a9b2be76f6c8 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Thu, 30 Nov 2017 23:56:11 +0000 Subject: [PATCH] ci: Fix Travis CI build issues Add python:i386 to gcc 32-bit builds to avoid a strange dependency issue with the gcc-4.9 and gcc-7 builds. Remove chrome workaround since it's not needed anymore. Change 32-bit clang dependency to gcc-7-multilib (no real reason, I just feel like doing so). [skip appveyor] --- travis.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/travis.sh b/travis.sh index 84ba68558b..a1ba09c842 100755 --- a/travis.sh +++ b/travis.sh @@ -18,18 +18,16 @@ linux_32_before_install() { if [ "${CXX}" = "clang++" ]; then sudo apt-key adv --fetch-keys http://apt.llvm.org/llvm-snapshot.gpg.key sudo add-apt-repository -y "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-${VERSION} main" - # g++-4.9-multilib is necessary for compiler dependencies. 4.8 currently - # has dependency issues, but 4.9 from the toolchain repo seems to work - # fine, so let's just use that. - COMPILER_PACKAGE="clang-${VERSION} g++-4.9-multilib clang-format-${VERSION}" + # g++-x-multilib is necessary for compiler dependencies. + COMPILER_PACKAGE="clang-${VERSION} g++-7-multilib clang-format-${VERSION}" fi if [ "${CXX}" = "g++" ]; then - COMPILER_PACKAGE="g++-${VERSION}-multilib" + # python:i386 is required to avoid dependency issues for gcc-4.9 and + # gcc-7. It causes issues with clang-format though, so the dependency is + # only specified for gcc. + COMPILER_PACKAGE="g++-${VERSION}-multilib python:i386" fi - # apt-get update fails because Chrome is 64-bit only. - sudo rm -f /etc/apt/sources.list.d/google-chrome.list - sudo apt-get -qq update # The 64-bit versions of the first 7 dependencies are part of the initial