From 96bbefb2ded94ff3f8949ef298150a32fca40cc4 Mon Sep 17 00:00:00 2001 From: Will Cosgrove Date: Tue, 15 Oct 2019 17:00:04 -0700 Subject: [PATCH] .travis.yml: Fix Chrome and 32 bit builds (#423) File: .travis.yml Notes: * Fix Chrome installing by using Travis build in directive * Update to use libgcrypt20-dev package to fix 32 bit builds based on comments found here: https://launchpad.net/ubuntu/xenial/i386/libgcrypt11-dev --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c60c729..e5e1b32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,6 +44,9 @@ compiler: - gcc - clang +addons: + chrome: stable + env: matrix: - B=style @@ -74,14 +77,10 @@ env: - ADDRESS_SIZE=32 CRYPTO_BACKEND=mbedTLS BUILD_SHARED_LIBS=ON ENABLE_ZLIB_COMPRESSION=ON B=cmake before_install: - # Fix issue with chrome and 32-bit multilib - # See http://www.omgubuntu.co.uk/2016/03/fix-failed-to-fetch-google-chrome-apt-error-ubuntu - - sudo sed -i -e 's/deb http/deb [arch=amd64] http/' "/etc/apt/sources.list.d/google-chrome.list" - - sudo sed -i -e 's/deb http/deb [arch=amd64] http/' "/opt/google/chrome/cron/google-chrome" - if [ $ADDRESS_SIZE = '32' ]; then sudo dpkg --add-architecture i386; fi - if [ $ADDRESS_SIZE = '32' ]; then sudo apt-get update -qq; fi - if [ $ADDRESS_SIZE = '32' ]; then sudo apt-get install -y gcc-multilib; fi - - if [ $ADDRESS_SIZE = '32' ]; then sudo apt-get install -y libssl-dev:i386 libgcrypt11-dev:i386 build-essential gcc-multilib; fi + - if [ $ADDRESS_SIZE = '32' ]; then sudo apt-get install -y libssl-dev:i386 libgcrypt20-dev:i386 build-essential gcc-multilib; fi - if [ $ADDRESS_SIZE = '32' ]; then sudo dpkg --purge --force-depends gcc-multilib && sudo dpkg --purge --force-depends libssl-dev; fi - if [ $ADDRESS_SIZE = '64' ]; then sudo apt-get install -y libssl-dev; fi - if [ $ADDRESS_SIZE = '64' ]; then sudo apt-get install -y libgcrypt11-dev; fi